Skip to content

Commit 68cc095

Browse files
authored
Merge pull request #64 from k8sstormcenter/entlein/ci-release-fixes
ci: unblock release pipeline — runner label, license fatal, webpack stamp word-split
2 parents 051422a + 3228c5b commit 68cc095

8 files changed

Lines changed: 16 additions & 11 deletions

File tree

.github/workflows/cli_release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
image-base-name: "dev_image_with_extras"
1616
build-release:
1717
name: Build Release
18-
runs-on: oracle-16cpu-64gb-x86-64
18+
runs-on: oracle-vm-16cpu-64gb-x86-64
1919
needs: get-dev-image
2020
permissions:
2121
contents: read

.github/workflows/cloud_release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
image-base-name: "dev_image_with_extras"
1616
build-release:
1717
name: Build Release
18-
runs-on: oracle-16cpu-64gb-x86-64
18+
runs-on: oracle-vm-16cpu-64gb-x86-64
1919
needs: get-dev-image
2020
permissions:
2121
contents: read

.github/workflows/mirror_deps.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
permissions:
1010
contents: read
1111
packages: write
12-
runs-on: oracle-16cpu-64gb-x86-64
12+
runs-on: oracle-vm-16cpu-64gb-x86-64
1313
steps:
1414
- uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v2
1515
with:

.github/workflows/operator_release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
image-base-name: "dev_image_with_extras"
1616
build-release:
1717
name: Build Release
18-
runs-on: oracle-16cpu-64gb-x86-64
18+
runs-on: oracle-vm-16cpu-64gb-x86-64
1919
needs: get-dev-image
2020
permissions:
2121
contents: read

.github/workflows/vizier_release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
image-base-name: "dev_image_with_extras"
1616
build-release:
1717
name: Build Release
18-
runs-on: oracle-16cpu-64gb-x86-64
18+
runs-on: oracle-vm-16cpu-64gb-x86-64
1919
needs: get-dev-image
2020
permissions:
2121
contents: read

bazel/ui.bzl

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717
# This file contains rules for for our UI builds.
1818

1919
ui_shared_cmds_start = [
20+
"set -x",
2021
'export BASE_PATH="$(pwd)"',
21-
"export PATH=/usr/local/bin:/opt/px_dev/tools/node/bin:$PATH",
22-
'export HOME="$(mktemp -d)"', # This makes node-gyp happy.
22+
"export PATH=/opt/px_dev/tools/node/bin:/usr/local/bin:$PATH",
23+
"hash -r",
24+
'export HOME="$(mktemp -d)"',
2325
'export TMPPATH="$(mktemp -d)"',
2426
]
2527

@@ -49,6 +51,7 @@ def _pl_webpack_deps_impl(ctx):
4951
execution_requirements = {tag: "" for tag in ctx.attr.tags},
5052
outputs = [out],
5153
command = " && ".join(cmd),
54+
use_default_shell_env = True,
5255
progress_message =
5356
"Generating webpack deps %s" % out.short_path,
5457
)
@@ -72,8 +75,8 @@ def _pl_webpack_library_impl(ctx):
7275
# and apply it to the environment here. Hopefully,
7376
# no special characters/spaces/quotes in the results ...
7477
env_cmds = [
75-
'$(sed -E "s/^([A-Za-z_]+)\\s*(.*)/export \\1=\\2/g" "{}")'.format(ctx.info_file.path),
76-
'$(sed -E "s/^([A-Za-z_]+)\\s*(.*)/export \\1=\\2/g" "{}")'.format(ctx.version_file.path),
78+
'$(sed -E -n "s/^(STABLE_BUILD_TAG|BUILD_TIMESTAMP)\\s+(.*)/export \\1=\\2/p" "{}")'.format(ctx.info_file.path),
79+
'$(sed -E -n "s/^(STABLE_BUILD_TAG|BUILD_TIMESTAMP)\\s+(.*)/export \\1=\\2/p" "{}")'.format(ctx.version_file.path),
7780
]
7881
all_files.append(ctx.info_file)
7982
all_files.append(ctx.version_file)
@@ -95,6 +98,7 @@ def _pl_webpack_library_impl(ctx):
9598
execution_requirements = {tag: "" for tag in ctx.attr.tags},
9699
outputs = [out],
97100
command = " && ".join(cmd),
101+
use_default_shell_env = True,
98102
progress_message =
99103
"Generating webpack bundle %s" % out.short_path,
100104
)
@@ -170,6 +174,7 @@ def _pl_deps_licenses_impl(ctx):
170174
execution_requirements = {tag: "" for tag in ctx.attr.tags},
171175
outputs = [out],
172176
command = " && ".join(cmd),
177+
use_default_shell_env = True,
173178
progress_message =
174179
"Generating licenses %s" % out.short_path,
175180
)

private/cockpit/cloud_ingress.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ metadata:
55
name: cloud-ingress
66
namespace: plc
77
annotations:
8-
external-dns.alpha.kubernetes.io/hostname: test.austrianopencloudcommunity.org,work.test.austrianopencloudcommunity.org
8+
external-dns.alpha.kubernetes.io/hostname: >-
9+
test.austrianopencloudcommunity.org,work.test.austrianopencloudcommunity.org
910
cert-manager.io/cluster-issuer: "letsencrypt-prod"
1011
spec:
1112
tls:

terraform/kubernetes/auth0/auth0_import.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,4 +296,3 @@ import {
296296
id = "signup-password:signup-password"
297297
to = auth0_prompt_screen_partial.signup_password_signup_password
298298
}
299-

0 commit comments

Comments
 (0)