Skip to content

[chore] test both amd64 and arm64 archs #131

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
mmanciop merged 8 commits into from
Nov 24, 2025
Merged

[chore] test both amd64 and arm64 archs #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d6d97f2
[chore] test both archs
atoulme Nov 9, 2025
9b2a4cf
use a base image with .NET 9 installed
atoulme Nov 9, 2025
a536aa5
add debug
atoulme Nov 10, 2025
36712b4
more fixes
atoulme Nov 11, 2025
b16c698
wip
atoulme Nov 24, 2025
eca4939
Exclude dotnet from running arm64
atoulme Nov 24, 2025
7526c49
Merge branch 'main' into test_arm_amd
atoulme Nov 24, 2025
c160e46
Merge branch 'main' into test_arm_amd
jaronoff97 Nov 24, 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
10 changes: 7 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,15 @@ jobs:
path: ./instrumentation/dist/*.${{ matrix.SYS_PACKAGE }}

packaging-integration-tests:
runs-on: ubuntu-24.04
strategy:
matrix:
SYS_PACKAGE: [ "deb", "rpm" ]
lang: [ "java", "nodejs", "dotnet" ]
arch: [ "amd64", "arm64" ]
exclude:
- lang: "dotnet"
arch: "arm64"
runs-on: ${{ matrix.arch == 'amd64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }}
steps:
- name: Check out the codebase.
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
Expand All @@ -82,8 +86,8 @@ jobs:
# in the step "Build ${{ matrix.ARCH }} ${{ matrix.SYS_PACKAGE }} package", and once here in the context of
# running the packacking integration tests. We should run the packaging integration tests for both CPU
# architectures (instead of only amd64), but ideally only build each combination of CPU arch & SYS_PACKAGE once.
- name: Run packaging integration tests for ${{ matrix.SYS_PACKAGE }}/${{ matrix.lang }}
run: make packaging-integration-test-${{ matrix.SYS_PACKAGE }}-${{ matrix.lang }}
- name: Run packaging integration tests for ${{ matrix.SYS_PACKAGE }}/${{ matrix.lang }}/${{ matrix.arch }}
run: ARCH=${{ matrix.arch }} make packaging-integration-test-${{ matrix.SYS_PACKAGE }}-${{ matrix.lang }}

publish-stable:
runs-on: ubuntu-24.04
Expand Down
3 changes: 3 additions & 0 deletions packaging/tests/rpm/dotnet/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ set -euo pipefail
arch="${ARCH:-amd64}"
if [ "$arch" = arm64 ]; then
docker_platform=linux/arm64
rpm_arch=aarch64
elif [ "$arch" = amd64 ]; then
docker_platform=linux/amd64
rpm_arch=x86_64
else
echo "The architecture $arch is not supported."
exit 1
Expand All @@ -18,6 +20,7 @@ cd "$SCRIPT_DIR/../../../.."
docker build \
--platform "$docker_platform" \
--build-arg "ARCH=$arch" \
--build-arg "RPM_ARCH=$rpm_arch" \
-t "instrumentation-dotnet-$arch" \
-f packaging/tests/rpm/dotnet/Dockerfile \
.
Expand Down
3 changes: 3 additions & 0 deletions packaging/tests/rpm/nodejs/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ set -euo pipefail
arch="${ARCH:-amd64}"
if [ "$arch" = arm64 ]; then
docker_platform=linux/arm64
rpm_arch=aarch64
elif [ "$arch" = amd64 ]; then
docker_platform=linux/amd64
rpm_arch=x86_64
else
echo "The architecture $arch is not supported."
exit 1
Expand All @@ -18,6 +20,7 @@ cd "$SCRIPT_DIR/../../../.."
docker build \
--platform "$docker_platform" \
--build-arg "ARCH=$arch" \
--build-arg "RPM_ARCH=$rpm_arch" \
-t "instrumentation-nodejs-$arch" \
-f packaging/tests/rpm/nodejs/Dockerfile \
.
Expand Down