Skip to content

Commit ce15671

Browse files
committed
GitHub CI/CD: Run the checks on the "arm64" (aarch64) architecture too.
1 parent ab3c1c0 commit ce15671

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

.github/workflows/cargo-workflow.yaml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@ jobs:
8888
with:
8989
packages: pkgconf libtss2-dev uuid-dev libjson-c-dev libcurl4-openssl-dev
9090
version: v2-${{ matrix.architecture }}-${{ matrix.platform }}-${{ github.run_id }}
91-
- run: |
92-
pkgconf --path tss2-fapi
93-
pkgconf --cflags --libs tss2-fapi
9491
- run: |
9592
cp -vr examples/data ~/my-fapi-config
9693
make docker.swtpm DETACH=1
@@ -119,9 +116,6 @@ jobs:
119116
with:
120117
packages: pkgconf libtss2-dev uuid-dev libjson-c-dev libcurl4-openssl-dev
121118
version: v2-${{ matrix.architecture }}-${{ matrix.platform }}-${{ github.run_id }}
122-
- run: |
123-
pkgconf --path tss2-fapi
124-
pkgconf --cflags --libs tss2-fapi
125119
- run: |
126120
make docker.swtpm DETACH=1
127121
make tests FAPI_RS_TEST_PROF=${{ matrix.profile }}
@@ -185,7 +179,8 @@ jobs:
185179
matrix:
186180
platform: ["${{ inputs.OS_VERS_MIN }}", "${{ inputs.OS_VERS_MAX }}"]
187181
rust: ["${{ inputs.TOOLCHAIN_MIN }}", "${{ inputs.TOOLCHAIN_MAX }}", "nightly"]
188-
runs-on: ubuntu-${{ matrix.platform }}
182+
architecture: [amd64, arm64]
183+
runs-on: ubuntu-${{ matrix.architecture == 'arm64' && format('{0}-arm', matrix.platform) || matrix.platform }}
189184
steps:
190185
- uses: actions/checkout@v4
191186
- uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -204,7 +199,7 @@ jobs:
204199
"$(pkg-config --print-provides tss2-fapi)" > target/release/BUILD_INFO
205200
- uses: actions/upload-artifact@v4
206201
with:
207-
name: dist.binary.ubuntu-${{ matrix.platform }}-rust-${{ matrix.rust }}
202+
name: dist.ubuntu-${{ matrix.platform }}-${{ matrix.architecture }}.rust-${{ matrix.rust }}
208203
path: |
209204
target/release/libtss2_fapi_rs.rlib
210205
target/release/README.md
@@ -295,7 +290,7 @@ jobs:
295290
path: artifacts
296291
- working-directory: artifacts
297292
run: |
298-
for variant in dist.binary.*; do pushd -- ${variant}; \
293+
for variant in dist.*; do pushd -- ${variant}; \
299294
tar -czvf ../tss2-fapi-rs-${{ github.ref_name }}-${variant:12}.tar.gz *; \
300295
popd; done; mv -vf dist.package/*.crate ./; rm -r */
301296
- uses: Roang-zero1/github-upload-release-artifacts-action@v2

0 commit comments

Comments
 (0)