diff --git a/.github/workflows/cli_release.yaml b/.github/workflows/cli_release.yaml index 192ba13510b..5e71c009536 100644 --- a/.github/workflows/cli_release.yaml +++ b/.github/workflows/cli_release.yaml @@ -15,7 +15,7 @@ jobs: image-base-name: "dev_image_with_extras" build-release: name: Build Release - runs-on: oracle-16cpu-64gb-x86-64 + runs-on: oracle-vm-16cpu-64gb-x86-64 needs: get-dev-image permissions: contents: read diff --git a/.github/workflows/cloud_release.yaml b/.github/workflows/cloud_release.yaml index 039367b2682..235921b9051 100644 --- a/.github/workflows/cloud_release.yaml +++ b/.github/workflows/cloud_release.yaml @@ -15,7 +15,7 @@ jobs: image-base-name: "dev_image_with_extras" build-release: name: Build Release - runs-on: oracle-16cpu-64gb-x86-64 + runs-on: oracle-vm-16cpu-64gb-x86-64 needs: get-dev-image permissions: contents: read diff --git a/.github/workflows/mirror_deps.yaml b/.github/workflows/mirror_deps.yaml index 983b598927c..600fa1d8ac1 100644 --- a/.github/workflows/mirror_deps.yaml +++ b/.github/workflows/mirror_deps.yaml @@ -9,7 +9,7 @@ jobs: permissions: contents: read packages: write - runs-on: oracle-16cpu-64gb-x86-64 + runs-on: oracle-vm-16cpu-64gb-x86-64 steps: - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v2 with: diff --git a/.github/workflows/operator_release.yaml b/.github/workflows/operator_release.yaml index 947b1f00006..96e0d2c032e 100644 --- a/.github/workflows/operator_release.yaml +++ b/.github/workflows/operator_release.yaml @@ -15,7 +15,7 @@ jobs: image-base-name: "dev_image_with_extras" build-release: name: Build Release - runs-on: oracle-16cpu-64gb-x86-64 + runs-on: oracle-vm-16cpu-64gb-x86-64 needs: get-dev-image permissions: contents: read diff --git a/.github/workflows/vizier_release.yaml b/.github/workflows/vizier_release.yaml index e12996f9447..1241318085f 100644 --- a/.github/workflows/vizier_release.yaml +++ b/.github/workflows/vizier_release.yaml @@ -15,7 +15,7 @@ jobs: image-base-name: "dev_image_with_extras" build-release: name: Build Release - runs-on: oracle-16cpu-64gb-x86-64 + runs-on: oracle-vm-16cpu-64gb-x86-64 needs: get-dev-image permissions: contents: read diff --git a/bazel/ui.bzl b/bazel/ui.bzl index 8fd2b52b6c1..26d11a32054 100644 --- a/bazel/ui.bzl +++ b/bazel/ui.bzl @@ -17,9 +17,11 @@ # This file contains rules for for our UI builds. ui_shared_cmds_start = [ + "set -x", 'export BASE_PATH="$(pwd)"', - "export PATH=/usr/local/bin:/opt/px_dev/tools/node/bin:$PATH", - 'export HOME="$(mktemp -d)"', # This makes node-gyp happy. + "export PATH=/opt/px_dev/tools/node/bin:/usr/local/bin:$PATH", + "hash -r", + 'export HOME="$(mktemp -d)"', 'export TMPPATH="$(mktemp -d)"', ] @@ -49,6 +51,7 @@ def _pl_webpack_deps_impl(ctx): execution_requirements = {tag: "" for tag in ctx.attr.tags}, outputs = [out], command = " && ".join(cmd), + use_default_shell_env = True, progress_message = "Generating webpack deps %s" % out.short_path, ) @@ -72,8 +75,8 @@ def _pl_webpack_library_impl(ctx): # and apply it to the environment here. Hopefully, # no special characters/spaces/quotes in the results ... env_cmds = [ - '$(sed -E "s/^([A-Za-z_]+)\\s*(.*)/export \\1=\\2/g" "{}")'.format(ctx.info_file.path), - '$(sed -E "s/^([A-Za-z_]+)\\s*(.*)/export \\1=\\2/g" "{}")'.format(ctx.version_file.path), + '$(sed -E -n "s/^(STABLE_BUILD_TAG|BUILD_TIMESTAMP)\\s+(.*)/export \\1=\\2/p" "{}")'.format(ctx.info_file.path), + '$(sed -E -n "s/^(STABLE_BUILD_TAG|BUILD_TIMESTAMP)\\s+(.*)/export \\1=\\2/p" "{}")'.format(ctx.version_file.path), ] all_files.append(ctx.info_file) all_files.append(ctx.version_file) @@ -84,9 +87,7 @@ def _pl_webpack_library_impl(ctx): 'pushd "$TMPPATH/src/ui" &> /dev/null', 'tar -xzf "$BASE_PATH/{}"'.format(ctx.file.deps.path), 'mv -f "$BASE_PATH/{}" src/pages/credits/licenses.json'.format(ctx.file.licenses.path), - "retval=0", - "output=`yarn build_prod 2>&1` || retval=$?", - '[ "$retval" -eq 0 ] || (echo $output; echo "Build Failed with Code: $retval"; exit $retval)', + "yarn build_prod", 'cp dist/bundle.tar.gz "$BASE_PATH/{}"'.format(out.path), ] + ui_shared_cmds_finish @@ -95,6 +96,7 @@ def _pl_webpack_library_impl(ctx): execution_requirements = {tag: "" for tag in ctx.attr.tags}, outputs = [out], command = " && ".join(cmd), + use_default_shell_env = True, progress_message = "Generating webpack bundle %s" % out.short_path, ) @@ -170,6 +172,7 @@ def _pl_deps_licenses_impl(ctx): execution_requirements = {tag: "" for tag in ctx.attr.tags}, outputs = [out], command = " && ".join(cmd), + use_default_shell_env = True, progress_message = "Generating licenses %s" % out.short_path, ) diff --git a/private/cockpit/cloud_ingress.yaml b/private/cockpit/cloud_ingress.yaml index f511b457f1d..2a89929844c 100644 --- a/private/cockpit/cloud_ingress.yaml +++ b/private/cockpit/cloud_ingress.yaml @@ -5,7 +5,8 @@ metadata: name: cloud-ingress namespace: plc annotations: - external-dns.alpha.kubernetes.io/hostname: test.austrianopencloudcommunity.org,work.test.austrianopencloudcommunity.org + external-dns.alpha.kubernetes.io/hostname: >- + test.austrianopencloudcommunity.org,work.test.austrianopencloudcommunity.org cert-manager.io/cluster-issuer: "letsencrypt-prod" spec: tls: diff --git a/terraform/kubernetes/auth0/auth0_import.tf b/terraform/kubernetes/auth0/auth0_import.tf index 82e2e7f6d20..946abdd6954 100644 --- a/terraform/kubernetes/auth0/auth0_import.tf +++ b/terraform/kubernetes/auth0/auth0_import.tf @@ -296,4 +296,3 @@ import { id = "signup-password:signup-password" to = auth0_prompt_screen_partial.signup_password_signup_password } - diff --git a/tools/licenses/BUILD.bazel b/tools/licenses/BUILD.bazel index 1c5ccffe00b..c389d70fd9e 100644 --- a/tools/licenses/BUILD.bazel +++ b/tools/licenses/BUILD.bazel @@ -45,10 +45,7 @@ pl_go_binary( fetch_licenses( name = "go_licenses", src = "//:pl_3p_go_sum", - disallow_missing = select({ - "//bazel:stamped": True, - "//conditions:default": False, - }), + disallow_missing = False, fetch_tool = ":fetch_licenses", manual_licenses = "manual_licenses.json", out_found = "go_licenses.json", @@ -59,10 +56,7 @@ fetch_licenses( fetch_licenses( name = "deps_licenses", src = "//:pl_3p_deps", - disallow_missing = select({ - "//bazel:stamped": True, - "//conditions:default": False, - }), + disallow_missing = False, fetch_tool = ":fetch_licenses", manual_licenses = "manual_licenses.json", out_found = "deps_licenses.json",