Skip to content

Commit 872e56c

Browse files
committed
ci: cross build with houseabsolute/actions-rust-cross@v1
1 parent fb2a71f commit 872e56c

File tree

1 file changed

+9
-22
lines changed

1 file changed

+9
-22
lines changed

.github/workflows/test.yaml

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -55,42 +55,29 @@ jobs:
5555
build:
5656
runs-on: ubuntu-latest
5757
needs: test
58-
continue-on-error: true
5958
strategy:
60-
fail-fast: false
6159
matrix:
62-
include:
60+
platform:
61+
- target: x86_64-unknown-linux-gnu
6362
- target: aarch64-unknown-linux-gnu
64-
build-essential: crossbuild-essential-arm64
65-
cargoflags: --config=target.aarch64-unknown-linux-gnu.linker=\"aarch64-linux-gnu-gcc\"
66-
cross: true
6763
- target: riscv64gc-unknown-linux-gnu
68-
build-essential: crossbuild-essential-riscv64
69-
cargoflags: --config=target.riscv64gc-unknown-linux-gnu.linker=\"riscv64-linux-gnu-gcc\"
70-
cross: true
71-
- target: x86_64-unknown-linux-gnu
72-
cross: false
7364
steps:
7465
- uses: actions/checkout@v4
75-
- uses: actions-rust-lang/setup-rust-toolchain@v1
66+
- uses: houseabsolute/actions-rust-cross@v1
7667
with:
77-
target: ${{ matrix.target }}
78-
cache-key: compile-release-${{ matrix.target }}
79-
- if: ${{ matrix.cross }}
80-
run: |
81-
sudo apt-get update
82-
sudo apt-get install ${{ matrix.build-essential }}
83-
- run: cargo b --workspace --release --target=${{ matrix.target }} ${{ matrix.cargoflags }}
68+
target: ${{ matrix.platform.target }}
69+
args: "--locked --release --workspace"
70+
strip: true
8471
- run: |
8572
mkdir -p staging/ artifacts/
8673
cp master/config/default.toml staging/config.toml
87-
find target/${{ matrix.target }}/release -maxdepth 1 -type f -executable -exec cp {} staging/ ';'
74+
find target/${{ matrix.platform.target }}/release -maxdepth 1 -type f -executable -exec cp {} staging/ ';'
8875
pushd staging/
89-
tar --zstd -cvf ../artifacts/xash3d-master-${{ matrix.target }}.tar.zst *
76+
tar --zstd -cvf ../artifacts/xash3d-master-${{ matrix.platform.target }}.tar.zst *
9077
popd
9178
- uses: actions/upload-artifact@v4
9279
with:
93-
name: artifact-${{ matrix.target }}
80+
name: artifact-${{ matrix.platform.target }}
9481
path: artifacts/*
9582

9683
release:

0 commit comments

Comments
 (0)