Skip to content

Commit

Permalink
Add linux arm build
Browse files Browse the repository at this point in the history
  • Loading branch information
tashcan committed Jan 16, 2025
1 parent 9a88236 commit 029d09d
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 16 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/benchmark.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions:
jobs:
benchmark:
name: Detour check
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -23,10 +23,6 @@ jobs:
run: |
echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
- uses: mjp41/workaround8649@c8550b715ccdc17f89c8d5c28d7a48eeff9c94a8
with:
os: ubuntu-latest

- name: Configure CMake
run: >
cmake -B ${{ steps.strings.outputs.build-output-dir }}
Expand Down
24 changes: 15 additions & 9 deletions .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-13, macos-14]
os: [ubuntu-24.04, ubuntu-24.04-arm, windows-latest, macos-13, macos-14]
build_type: [Release, Debug]
c_compiler: [gcc, clang, cl, clang-cl]
include:
Expand All @@ -24,10 +24,16 @@ jobs:
c_compiler: clang-cl
cpp_compiler: clang-cl
toolset: ClangCL
- os: ubuntu-latest
- os: ubuntu-24.04
c_compiler: gcc
cpp_compiler: g++
- os: ubuntu-latest
- os: ubuntu-24.04
c_compiler: clang
cpp_compiler: clang++
- os: ubuntu-24.04-arm
c_compiler: gcc
cpp_compiler: g++
- os: ubuntu-24.04-arm
c_compiler: clang
cpp_compiler: clang++
- os: macos-13
Expand All @@ -41,9 +47,13 @@ jobs:
c_compiler: gcc
- os: windows-latest
c_compiler: clang
- os: ubuntu-latest
- os: ubuntu-24.04
c_compiler: cl
- os: ubuntu-latest
- os: ubuntu-24.04
c_compiler: clang-cl
- os: ubuntu-24.04-arm
c_compiler: cl
- os: ubuntu-24.04-arm
c_compiler: clang-cl
- os: macos-13
c_compiler: cl
Expand All @@ -68,10 +78,6 @@ jobs:
run: |
echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
- uses: mjp41/workaround8649@c8550b715ccdc17f89c8d5c28d7a48eeff9c94a8
with:
os: ${{ matrix.os }}

- name: Configure CMake
if: ${{ startsWith(matrix.toolset, 'ClangCL') }}
run: >
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
publish:
environment: docs
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
contents: read
deployments: write
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ if(SPUD_BUILD_TESTS)
FetchContent_Declare(
Catch2
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
GIT_TAG v3.0.1
GIT_TAG v3.8.0
)

FetchContent_MakeAvailable(Catch2)
Expand Down

0 comments on commit 029d09d

Please sign in to comment.