Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cli_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cloud_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mirror_deps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/operator_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vizier_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 10 additions & 7 deletions bazel/ui.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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)"',
]

Expand Down Expand Up @@ -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,
)
Expand All @@ -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),
]
Comment thread
entlein marked this conversation as resolved.
all_files.append(ctx.info_file)
all_files.append(ctx.version_file)
Expand All @@ -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

Expand All @@ -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,
)
Expand Down Expand Up @@ -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,
)
Expand Down
3 changes: 2 additions & 1 deletion private/cockpit/cloud_ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion terraform/kubernetes/auth0/auth0_import.tf
Original file line number Diff line number Diff line change
Expand Up @@ -296,4 +296,3 @@ import {
id = "signup-password:signup-password"
to = auth0_prompt_screen_partial.signup_password_signup_password
}

10 changes: 2 additions & 8 deletions tools/licenses/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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,

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why?

fetch_tool = ":fetch_licenses",
manual_licenses = "manual_licenses.json",
out_found = "deps_licenses.json",
Expand Down
Loading