Skip to content

Commit 552d507

Browse files
committed
GitHub CI/CD: Run the checks on the "arm64" (aarch64) architecture too.
1 parent 7840f1b commit 552d507

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

.github/workflows/cargo-workflow.yaml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,8 @@ jobs:
6060
- uses: awalsh128/[email protected]
6161
with:
6262
packages: libtss2-dev uuid-dev libjson-c-dev libcurl4-openssl-dev
63-
version: ${{ matrix.architecture }}-${{ matrix.platform }}-${{ matrix.rust }}-v1
64-
- run: |
65-
set -x
66-
pkgconf --path tss2-fapi || true
67-
pkgconf --cflags --libs tss2-fapi || true
63+
version: v1-${{ matrix.architecture }}-${{ matrix.platform }}-${{ github.run_id }}
64+
- run: pkgconf --cflags --libs tss2-fapi
6865
- run: make check
6966

7067
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -77,7 +74,8 @@ jobs:
7774
matrix:
7875
platform: ["${{ inputs.OS_VERS_MIN }}", "${{ inputs.OS_VERS_MAX }}"]
7976
rust: ["${{ inputs.TOOLCHAIN_MIN }}", "${{ inputs.TOOLCHAIN_MAX }}", "nightly"]
80-
runs-on: ubuntu-${{ matrix.platform }}
77+
architecture: [amd64, arm64]
78+
runs-on: ubuntu-${{ matrix.architecture == 'arm64' && format('{0}-arm', matrix.platform) || matrix.platform }}
8179
steps:
8280
- uses: actions/checkout@v4
8381
- uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -87,6 +85,7 @@ jobs:
8785
- uses: awalsh128/[email protected]
8886
with:
8987
packages: libtss2-dev uuid-dev libjson-c-dev libcurl4-openssl-dev
88+
version: v1-${{ matrix.architecture }}-${{ matrix.platform }}-${{ github.run_id }}
9089
- run: |
9190
cp -vr examples/data ~/my-fapi-config
9291
make docker.swtpm DETACH=1
@@ -113,6 +112,7 @@ jobs:
113112
- uses: awalsh128/[email protected]
114113
with:
115114
packages: libtss2-dev uuid-dev libjson-c-dev libcurl4-openssl-dev
115+
version: v1-${{ matrix.architecture }}-${{ matrix.platform }}-${{ github.run_id }}
116116
- run: |
117117
make docker.swtpm DETACH=1
118118
make tests FAPI_RS_TEST_PROF=${{ matrix.profile }}
@@ -152,6 +152,7 @@ jobs:
152152
- uses: awalsh128/[email protected]
153153
with:
154154
packages: libtss2-dev uuid-dev libjson-c-dev libcurl4-openssl-dev
155+
version: v1-${{ matrix.architecture }}-${{ matrix.platform }}-${{ github.run_id }}
155156
- run: |
156157
make docker.swtpm DETACH=1
157158
make codecov RUST_LOG=info TSS2_LOG=all+none
@@ -186,6 +187,7 @@ jobs:
186187
- uses: awalsh128/[email protected]
187188
with:
188189
packages: libtss2-dev uuid-dev libjson-c-dev libcurl4-openssl-dev
190+
version: v1-${{ matrix.architecture }}-${{ matrix.platform }}-${{ github.run_id }}
189191
- run: make build
190192
- run: cp -vf README.md LICENSE target/release/
191193
- run: |
@@ -217,6 +219,7 @@ jobs:
217219
- uses: awalsh128/[email protected]
218220
with:
219221
packages: libtss2-dev uuid-dev libjson-c-dev libcurl4-openssl-dev
222+
version: v1-${{ matrix.architecture }}-${{ matrix.platform }}-${{ github.run_id }}
220223
- run: make docs
221224
- run: |
222225
cp -f docs/html/redir.html target/doc/index.html
@@ -241,6 +244,7 @@ jobs:
241244
- uses: awalsh128/[email protected]
242245
with:
243246
packages: libtss2-dev uuid-dev libjson-c-dev libcurl4-openssl-dev
247+
version: v1-${{ matrix.architecture }}-${{ matrix.platform }}-${{ github.run_id }}
244248
- run: make package
245249
- uses: actions/upload-artifact@v4
246250
with:
@@ -309,6 +313,7 @@ jobs:
309313
- uses: awalsh128/[email protected]
310314
with:
311315
packages: libtss2-dev uuid-dev libjson-c-dev libcurl4-openssl-dev
316+
version: v1-${{ matrix.architecture }}-${{ matrix.platform }}-${{ github.run_id }}
312317
- run: make publish
313318
env:
314319
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}

0 commit comments

Comments
 (0)