From c0b4ac066a6178ee6e166589ff85d17839dd2580 Mon Sep 17 00:00:00 2001 From: Johnny Date: Mon, 20 Jan 2025 20:58:50 +0100 Subject: [PATCH 1/2] Update build.yml --- .github/workflows/build.yml | 60 +++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 10df9d68..cdbeb499 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,12 +21,30 @@ jobs: build_workspace: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + + strategy: + matrix: + os: [ubuntu-latest, ubuntu24.04-arm] + include: + - os: ubuntu-latest + - os: ubuntu24.04-arm + rust-target: aarch64-unknown-linux-gnu steps: - uses: actions/checkout@v4 with: lfs: true + - uses: actions/setup-python@v4 + if: matrix.os == 'ubuntu24.04-arm' + with: + python-version: '3.12' + - name: Install rust toolchain (ARM) + if: matrix.os == 'ubuntu24.04-arm' + run: | + rustup toolchain install stable-aarch64-unknown-linux-gnu + rustup default stable-aarch64-unknown-linux-gnu + rustup target add ${{ matrix.rust-target }} - name: Check run: cargo check --verbose - name: Check with examples @@ -40,12 +58,30 @@ jobs: build_lib_all_features: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + + strategy: + matrix: + os: [ubuntu-latest, ubuntu24.04-arm] + include: + - os: ubuntu-latest + - os: ubuntu24.04-arm + rust-target: aarch64-unknown-linux-gnu steps: - uses: actions/checkout@v4 with: lfs: true + - uses: actions/setup-python@v4 + if: matrix.os == 'ubuntu24.04-arm' + with: + python-version: '3.12' + - name: Install rust toolchain (ARM) + if: matrix.os == 'ubuntu24.04-arm' + run: | + rustup toolchain install stable-aarch64-unknown-linux-gnu + rustup default stable-aarch64-unknown-linux-gnu + rustup target add ${{ matrix.rust-target }} - name: Build run: | cargo build --manifest-path="splashsurf_lib/Cargo.toml" --all-features --verbose @@ -58,12 +94,30 @@ jobs: build_lib_no_default_features: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, ubuntu24.04-arm] + include: + - os: ubuntu-latest + - os: ubuntu24.04-arm + rust-target: aarch64-unknown-linux-gnu + steps: - uses: actions/checkout@v4 with: lfs: true + - uses: actions/setup-python@v4 + if: matrix.os == 'ubuntu24.04-arm' + with: + python-version: '3.12' + - name: Install rust toolchain (ARM) + if: matrix.os == 'ubuntu24.04-arm' + run: | + rustup toolchain install stable-aarch64-unknown-linux-gnu + rustup default stable-aarch64-unknown-linux-gnu + rustup target add ${{ matrix.rust-target }} - name: Build run: | cargo build --manifest-path="splashsurf_lib/Cargo.toml" --no-default-features --verbose From 19fed2f59a695b050f738df147ca0d7ba984d662 Mon Sep 17 00:00:00 2001 From: Johnny Date: Mon, 20 Jan 2025 21:09:44 +0100 Subject: [PATCH 2/2] fix typo --- .github/workflows/build.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cdbeb499..da7887bc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,10 +25,10 @@ jobs: strategy: matrix: - os: [ubuntu-latest, ubuntu24.04-arm] + os: [ubuntu-latest, ubuntu-24.04-arm] include: - os: ubuntu-latest - - os: ubuntu24.04-arm + - os: ubuntu-24.04-arm rust-target: aarch64-unknown-linux-gnu steps: @@ -36,11 +36,11 @@ jobs: with: lfs: true - uses: actions/setup-python@v4 - if: matrix.os == 'ubuntu24.04-arm' + if: matrix.os == 'ubuntu-24.04-arm' with: python-version: '3.12' - name: Install rust toolchain (ARM) - if: matrix.os == 'ubuntu24.04-arm' + if: matrix.os == 'ubuntu-24.04-arm' run: | rustup toolchain install stable-aarch64-unknown-linux-gnu rustup default stable-aarch64-unknown-linux-gnu @@ -62,10 +62,10 @@ jobs: strategy: matrix: - os: [ubuntu-latest, ubuntu24.04-arm] + os: [ubuntu-latest, ubuntu-24.04-arm] include: - os: ubuntu-latest - - os: ubuntu24.04-arm + - os: ubuntu-24.04-arm rust-target: aarch64-unknown-linux-gnu steps: @@ -73,11 +73,11 @@ jobs: with: lfs: true - uses: actions/setup-python@v4 - if: matrix.os == 'ubuntu24.04-arm' + if: matrix.os == 'ubuntu-24.04-arm' with: python-version: '3.12' - name: Install rust toolchain (ARM) - if: matrix.os == 'ubuntu24.04-arm' + if: matrix.os == 'ubuntu-24.04-arm' run: | rustup toolchain install stable-aarch64-unknown-linux-gnu rustup default stable-aarch64-unknown-linux-gnu @@ -98,10 +98,10 @@ jobs: strategy: matrix: - os: [ubuntu-latest, ubuntu24.04-arm] + os: [ubuntu-latest, ubuntu-24.04-arm] include: - os: ubuntu-latest - - os: ubuntu24.04-arm + - os: ubuntu-24.04-arm rust-target: aarch64-unknown-linux-gnu steps: @@ -109,11 +109,11 @@ jobs: with: lfs: true - uses: actions/setup-python@v4 - if: matrix.os == 'ubuntu24.04-arm' + if: matrix.os == 'ubuntu-24.04-arm' with: python-version: '3.12' - name: Install rust toolchain (ARM) - if: matrix.os == 'ubuntu24.04-arm' + if: matrix.os == 'ubuntu-24.04-arm' run: | rustup toolchain install stable-aarch64-unknown-linux-gnu rustup default stable-aarch64-unknown-linux-gnu