Skip to content

Fix bazel compile commands syntax, use correct platform name for ARM64 #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlexanderLanin merged 3 commits into from
Oct 13, 2025
Merged

Fix bazel compile commands syntax, use correct platform name for ARM64 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95afbfc
Bazel versions 7.x do not support this syntax
opajonk Oct 10, 2025
f76e768
Use correct platform name for ARM64-based chips
opajonk Oct 11, 2025
b875fc5
Bazel versions 7.x do not support this syntax
opajonk Oct 11, 2025
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 scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Copy link
Contributor

@lurtz lurtz Oct 11, 2025

Choose a reason for hiding this comment

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

can we make this one optional? Locally I already commented building for ARM, because I only need / use x86

Copy link
Contributor Author

@opajonk opajonk Oct 11, 2025

Choose a reason for hiding this comment

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

No the default is to build all. If you want to do something else locally - no problem ;-)

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
2 changes: 1 addition & 1 deletion scripts/publish.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion src/s-core-devcontainer/.devcontainer/s-core-local/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

@lurtz lurtz Oct 11, 2025

Choose a reason for hiding this comment

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

I wonder why the shells set e did not cause a failure here

Copy link
Contributor Author

@opajonk opajonk Oct 11, 2025

Choose a reason for hiding this comment

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

It does not fail in this case, since there Bazel 8.4.x (as specified) is always used. I changed this line only to have it consistent with the other line that had to be changed.

ls -lah /tmp/bazel-complete.bash
mkdir -p /etc/bash_completion.d
mv /tmp/bazel-complete.bash /etc/bash_completion.d/bazel-complete.bash
Expand Down
2 changes: 1 addition & 1 deletion src/s-core-devcontainer/.devcontainer/s-core-local/install_matching_bazel_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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