From c1c8e89d1835bea974fb665d290223fa37459080 Mon Sep 17 00:00:00 2001 From: Jacques Nadeau Date: Thu, 25 Jul 2024 14:38:04 -1000 Subject: [PATCH 1/4] try to add arm to github action --- .github/workflows/build_test.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index e69559ea..31080ba7 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -8,7 +8,7 @@ on: branches: [main] jobs: - check: + linux-check: runs-on: ubuntu-latest steps: @@ -46,4 +46,17 @@ jobs: run: ninja -C build - name: Test run: ctest --test-dir build --output-on-failure --timeout 30 + darwin-arm64-check: + needs: prepare + runs-on: macos-14-arm64 + steps: + - uses: actions/checkout@v3 + with: + ref: ${{ github.head_ref }} + - name: Debug Build + shell: bash + run: make + - name: Debug Test + shell: bash + run: ctest --test-dir build-Debug --output-on-failure --timeout 30 From 1371713691f9519964dd7dca7f925d31a501e15c Mon Sep 17 00:00:00 2001 From: Jacques Nadeau Date: Thu, 25 Jul 2024 14:51:40 -1000 Subject: [PATCH 2/4] remove extraneous dependency --- .github/workflows/build_test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 31080ba7..ed1cf212 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -47,7 +47,6 @@ jobs: - name: Test run: ctest --test-dir build --output-on-failure --timeout 30 darwin-arm64-check: - needs: prepare runs-on: macos-14-arm64 steps: - uses: actions/checkout@v3 From d3a1b5c094096797177b8ae6be8527d53e4cb780 Mon Sep 17 00:00:00 2001 From: Jacques Nadeau Date: Thu, 25 Jul 2024 15:01:32 -1000 Subject: [PATCH 3/4] switch to amd darwin as it appears that arm darwin instances are slow to get. --- .github/workflows/build_test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index ed1cf212..e467fa75 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -27,7 +27,7 @@ jobs: run: git diff --exit-code - name: Checking code style run: ./scripts/run-clang-tidy.sh - build: + linux-build: runs-on: ubuntu-latest steps: @@ -46,8 +46,8 @@ jobs: run: ninja -C build - name: Test run: ctest --test-dir build --output-on-failure --timeout 30 - darwin-arm64-check: - runs-on: macos-14-arm64 + darwin-amd64-build-and-test: + runs-on: macos-14 steps: - uses: actions/checkout@v3 with: From 6c081a94e2a26605a4aacc45aee7002c39d40778 Mon Sep 17 00:00:00 2001 From: Jacques Nadeau Date: Thu, 25 Jul 2024 15:05:10 -1000 Subject: [PATCH 4/4] fix checkout --- .github/workflows/build_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index e467fa75..c1822495 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -51,7 +51,7 @@ jobs: steps: - uses: actions/checkout@v3 with: - ref: ${{ github.head_ref }} + submodules: recursive - name: Debug Build shell: bash run: make