From 553a17bb2d688311736dad8b461797e2a0cbc19b Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Tue, 9 Jan 2024 09:25:46 +0100 Subject: [PATCH 1/7] ci: add run-on-arch for ARM64 linux --- .github/workflows/run-on-arch.yml | 45 +++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/run-on-arch.yml diff --git a/.github/workflows/run-on-arch.yml b/.github/workflows/run-on-arch.yml new file mode 100644 index 000000000..04c67d737 --- /dev/null +++ b/.github/workflows/run-on-arch.yml @@ -0,0 +1,45 @@ +on: [push, pull_request] + +jobs: + build_job: + # The host should always be linux + runs-on: ubuntu-22.04 + name: Build on ${{ matrix.distro }} ${{ matrix.arch }} + + # Run steps on Bullseye=Debian 11 + strategy: + matrix: + include: + - arch: aarch64 + distro: bullseye + + steps: + - uses: actions/checkout@v4 + + - uses: uraimo/run-on-arch-action@v2 + name: Build artifact + id: build + with: + arch: ${{ matrix.arch }} + distro: ${{ matrix.distro }} + + # Not required, but speeds up builds + githubToken: ${{ github.token }} + + env: | + CMAKE_GENERATOR: Ninja + + shell: /bin/bash + + install: | + case "${{ matrix.distro }}" in + ubuntu*|jessie|stretch|buster|bullseye) + apt-get update -q -y + apt-get install -q -y cmake gcc git libssl-dev ninja-build valgrind + ;; + esac + + run: | + cmake -B build -DCMAKE_C_FLAGS="-Werror" + cmake --build build -j -t retest + valgrind --leak-check=full --show-reachable=yes --error-exitcode=42 ./build/test/retest -r -v From 26bbc5c1a3ac63586a33e7c540ff79843b1e8447 Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Tue, 9 Jan 2024 09:32:00 +0100 Subject: [PATCH 2/7] install g++ --- .github/workflows/run-on-arch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-on-arch.yml b/.github/workflows/run-on-arch.yml index 04c67d737..4060da78d 100644 --- a/.github/workflows/run-on-arch.yml +++ b/.github/workflows/run-on-arch.yml @@ -35,7 +35,7 @@ jobs: case "${{ matrix.distro }}" in ubuntu*|jessie|stretch|buster|bullseye) apt-get update -q -y - apt-get install -q -y cmake gcc git libssl-dev ninja-build valgrind + apt-get install -q -y cmake gcc g++ git libssl-dev ninja-build valgrind ;; esac From f8219d0692a1700fee8eaf0a038735d3b33ce59b Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Tue, 9 Jan 2024 12:34:12 +0100 Subject: [PATCH 3/7] cleanup --- .github/workflows/run-on-arch.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run-on-arch.yml b/.github/workflows/run-on-arch.yml index 4060da78d..a09dbe510 100644 --- a/.github/workflows/run-on-arch.yml +++ b/.github/workflows/run-on-arch.yml @@ -3,7 +3,7 @@ on: [push, pull_request] jobs: build_job: # The host should always be linux - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 name: Build on ${{ matrix.distro }} ${{ matrix.arch }} # Run steps on Bullseye=Debian 11 @@ -11,7 +11,7 @@ jobs: matrix: include: - arch: aarch64 - distro: bullseye + distro: ubuntu20.04 steps: - uses: actions/checkout@v4 @@ -29,17 +29,15 @@ jobs: env: | CMAKE_GENERATOR: Ninja - shell: /bin/bash - install: | case "${{ matrix.distro }}" in ubuntu*|jessie|stretch|buster|bullseye) apt-get update -q -y - apt-get install -q -y cmake gcc g++ git libssl-dev ninja-build valgrind + apt-get install -q -y cmake gcc g++ libssl-dev ninja-build ;; esac run: | cmake -B build -DCMAKE_C_FLAGS="-Werror" cmake --build build -j -t retest - valgrind --leak-check=full --show-reachable=yes --error-exitcode=42 ./build/test/retest -r -v + ./build/test/retest -r -v From 28f237842dfccbfe5846317d5fddb7818486cd92 Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Wed, 10 Jan 2024 11:53:23 +0100 Subject: [PATCH 4/7] test Debian 10 buster --- .github/workflows/run-on-arch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-on-arch.yml b/.github/workflows/run-on-arch.yml index a09dbe510..756c037d8 100644 --- a/.github/workflows/run-on-arch.yml +++ b/.github/workflows/run-on-arch.yml @@ -11,7 +11,7 @@ jobs: matrix: include: - arch: aarch64 - distro: ubuntu20.04 + distro: buster steps: - uses: actions/checkout@v4 From 970f4b2bc69baf4f2465c75d51f7e32a6be3a436 Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Wed, 10 Jan 2024 11:57:15 +0100 Subject: [PATCH 5/7] cmake workaround --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 355355ec0..de0a9d2ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ # Versioning # -cmake_minimum_required(VERSION 3.14) +cmake_minimum_required(VERSION 3.13) project(re VERSION 3.8.0 From 16b72f17ed143923ce5d1138c1067af697a8d2d3 Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Wed, 10 Jan 2024 12:16:05 +0100 Subject: [PATCH 6/7] cmake: use --target --- .github/workflows/run-on-arch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-on-arch.yml b/.github/workflows/run-on-arch.yml index 756c037d8..dea25ab8a 100644 --- a/.github/workflows/run-on-arch.yml +++ b/.github/workflows/run-on-arch.yml @@ -39,5 +39,5 @@ jobs: run: | cmake -B build -DCMAKE_C_FLAGS="-Werror" - cmake --build build -j -t retest + cmake --build build -j --target retest ./build/test/retest -r -v From 9ea0397816f178be000e47472b25cc281a402042 Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Thu, 11 Jan 2024 08:23:48 +0100 Subject: [PATCH 7/7] cleanup --- .github/workflows/run-on-arch.yml | 8 ++------ CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/run-on-arch.yml b/.github/workflows/run-on-arch.yml index dea25ab8a..6be3488ce 100644 --- a/.github/workflows/run-on-arch.yml +++ b/.github/workflows/run-on-arch.yml @@ -6,12 +6,11 @@ jobs: runs-on: ubuntu-20.04 name: Build on ${{ matrix.distro }} ${{ matrix.arch }} - # Run steps on Bullseye=Debian 11 strategy: matrix: include: - arch: aarch64 - distro: buster + distro: bullseye steps: - uses: actions/checkout@v4 @@ -26,9 +25,6 @@ jobs: # Not required, but speeds up builds githubToken: ${{ github.token }} - env: | - CMAKE_GENERATOR: Ninja - install: | case "${{ matrix.distro }}" in ubuntu*|jessie|stretch|buster|bullseye) @@ -38,6 +34,6 @@ jobs: esac run: | - cmake -B build -DCMAKE_C_FLAGS="-Werror" + cmake -G Ninja -B build -DCMAKE_C_FLAGS="-Werror" cmake --build build -j --target retest ./build/test/retest -r -v diff --git a/CMakeLists.txt b/CMakeLists.txt index de0a9d2ae..355355ec0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ # Versioning # -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.14) project(re VERSION 3.8.0