Skip to content
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.

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

Add aarch64 native builds to CI #4562

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
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
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,12 @@ jobs:
- target: cross-arm32
compiler: gcc
host_os: ubuntu-24.04
- target: cross-arm64
- target: shared
compiler: gcc
host_os: ubuntu-24.04
host_os: ubuntu-24.04-arm
- target: shared
compiler: clang
host_os: ubuntu-24.04-arm
- target: cross-ppc64
compiler: gcc
host_os: ubuntu-24.04
Expand Down
16 changes: 12 additions & 4 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ jobs:
- target: cross-android-arm64-amalgamation
compiler: clang
host_os: ubuntu-24.04
- target: cross-arm64-amalgamation
- target: amalgamation
compiler: gcc
host_os: ubuntu-24.04
host_os: ubuntu-24.04-arm
- target: emscripten
compiler: emcc
host_os: macos-14
Expand Down Expand Up @@ -170,22 +170,30 @@ jobs:
compiler: ["clang", "gcc"]
cxxflags: ["-O1", "-O2", "-O3"]
target: ["valgrind-ct-full"]
platform: ["ubuntu-24.04", "ubuntu-24.04-arm"]

exclude:
- platform: "ubuntu-24.04-arm"
cxxflags: "-O1"

include:
- compiler: clang
cxxflags: "" # default compilation flags
target: "valgrind-full" # memory bug detection
platform: "ubuntu-24.04"
- compiler: clang
cxxflags: "-Os"
# Clang's -Os generated binary is fast enough to run the full test suite.
target: "valgrind-ct-full"
platform: "ubuntu-24.04"
- compiler: gcc
cxxflags: "-Os"
# GCC with -Os generates a much slower binary, that won't finish
# before timing out on GH Actions, so we run a reduced set of tests.
target: "valgrind-ct"
platform: "ubuntu-24.04"

runs-on: ubuntu-24.04
runs-on: ${{ matrix.platform }}

steps:
- uses: actions/checkout@v4
Expand All @@ -197,7 +205,7 @@ jobs:
uses: ./.github/actions/setup-build-agent
with:
target: ${{ matrix.target }}
cache-key: linux-x86_64-${{ matrix.compiler }}-${{ matrix.target }}-${{ matrix.cxxflags }}
cache-key: ${{ matrix.platform }}-${{ matrix.compiler }}-${{ matrix.target }}-${{ matrix.cxxflags }}

- name: Valgrind Checks
run: python3 ./src/scripts/ci_build.py --make-tool=make --cc=${{ matrix.compiler }} --custom-optimization-flags="${{ matrix.cxxflags }}" ${{ matrix.target }}
Expand Down
7 changes: 1 addition & 6 deletions src/scripts/ci/setup_gh_actions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,8 @@ if type -p "apt-get"; then
# (l)ist mode (avoiding https://github.com/actions/runner-images/issues/9996)
sudo NEEDRESTART_MODE=l apt-get -qq install valgrind

elif [ "$TARGET" = "static" ]; then
sudo apt-get -qq install "${tpm2_specific_packages[@]}"
echo "BOTAN_TPM2_ENABLED=${ci_support_of_tpm2}" >> "$GITHUB_ENV"

elif [ "$TARGET" = "shared" ]; then
sudo apt-get -qq install libboost-dev "${tpm2_specific_packages[@]}"
echo "BOTAN_TPM2_ENABLED=${ci_support_of_tpm2}" >> "$GITHUB_ENV"
sudo apt-get -qq install libboost-dev

elif [ "$TARGET" = "examples" ] || [ "$TARGET" = "amalgamation" ] || [ "$TARGET" = "tlsanvil" ] || [ "$TARGET" = "clang-tidy" ] ; then
sudo apt-get -qq install libboost-dev libtss2-dev
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/ci_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ def sanitize_kv(some_string):
if target == 'coverage':
flags += ['--with-coverage-info']

if target in ['coverage']:
if target in ['coverage', 'valgrind', 'valgrind-full', 'valgrind-ct', 'valgrind-ct-full']:
flags += ['--with-debug-info']

if target in ['coverage', 'sanitizer', 'fuzzers']:
Expand Down
Loading