From 95afbfcfa3fa81a9271d70665ef09409a8b74120 Mon Sep 17 00:00:00 2001 From: Oliver Pajonk Date: Fri, 10 Oct 2025 14:15:11 +0000 Subject: [PATCH 1/3] Bazel versions 7.x do not support this syntax There, "bash" must be omitted from the call. --- .../s-core-local/install_matching_bazel_version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/install_matching_bazel_version.sh b/src/s-core-devcontainer/.devcontainer/s-core-local/install_matching_bazel_version.sh index 642fbff..0ffd36a 100755 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/install_matching_bazel_version.sh +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/install_matching_bazel_version.sh @@ -4,7 +4,7 @@ set -eo pipefail if [ -f .bazelversion ] && [ "$(cat .bazelversion)" != "$(bazel version | grep 'Build label:' | awk '{print $3}')" ]; then # Pre-install the matching Bazel version, setup the bash command completion USE_BAZEL_VERSION=$(cat .bazelversion) - bazel help completion bash > /tmp/bazel-complete.bash + bazel help completion > /tmp/bazel-complete.bash sudo mv /tmp/bazel-complete.bash /etc/bash_completion.d/bazel-complete.bash sudo sed -i '/^USE_BAZEL_VERSION=/c\USE_BAZEL_VERSION=${USE_BAZEL_VERSION}' /etc/profile.d/bazel.sh || true fi From f76e7680cdcc95e16a9a9c9a597a6bddefd5ec27 Mon Sep 17 00:00:00 2001 From: Oliver Pajonk Date: Sat, 11 Oct 2025 14:14:29 +0000 Subject: [PATCH 2/3] Use correct platform name for ARM64-based chips At least on MacOS, the current name does not work. platform/arm64 is correct. --- scripts/build.sh | 2 +- scripts/publish.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index e4a23ff..ac68511 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash set -euxo pipefail -devcontainer build --platform linux/aarch64 --workspace-folder src/s-core-devcontainer --image-name ghcr.io/eclipse-score/devcontainer --cache-from ghcr.io/eclipse-score/devcontainer +devcontainer build --platform linux/arm64 --workspace-folder src/s-core-devcontainer --image-name ghcr.io/eclipse-score/devcontainer --cache-from ghcr.io/eclipse-score/devcontainer devcontainer build --platform linux/amd64 --workspace-folder src/s-core-devcontainer --image-name ghcr.io/eclipse-score/devcontainer --cache-from ghcr.io/eclipse-score/devcontainer diff --git a/scripts/publish.sh b/scripts/publish.sh index 6bca3f4..1dbca82 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -15,5 +15,5 @@ for IMAGE in "${IMAGES[@]}"; do DEVCONTAINER_CALL+=" $IMAGE" done -eval "$DEVCONTAINER_CALL --platform linux/aarch64" +eval "$DEVCONTAINER_CALL --platform linux/arm64" eval "$DEVCONTAINER_CALL --platform linux/amd64" From b875fc5de4c3e2b8b05c1f7583d2388393b096c3 Mon Sep 17 00:00:00 2001 From: Oliver Pajonk Date: Sat, 11 Oct 2025 14:15:23 +0000 Subject: [PATCH 3/3] Bazel versions 7.x do not support this syntax There, "bash" must be omitted from the call. This also works for Bazel 8.x, so let's use that. --- src/s-core-devcontainer/.devcontainer/s-core-local/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh b/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh index 1e0a2fa..f048854 100755 --- a/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh +++ b/src/s-core-devcontainer/.devcontainer/s-core-local/install.sh @@ -47,7 +47,7 @@ rm /tmp/bazelisk.deb # Pre-install a fixed Bazel version, setup the bash command completion export USE_BAZEL_VERSION=${bazel_version} -bazel help completion bash > /tmp/bazel-complete.bash +bazel help completion > /tmp/bazel-complete.bash ls -lah /tmp/bazel-complete.bash mkdir -p /etc/bash_completion.d mv /tmp/bazel-complete.bash /etc/bash_completion.d/bazel-complete.bash