Skip to content

Commit a5ed3e6

Browse files
committed
maybe fix ci
1 parent 95b92f2 commit a5ed3e6

File tree

3 files changed

+9
-21
lines changed

3 files changed

+9
-21
lines changed

.github/workflows/linux_builds.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@ on:
55
jobs:
66
linux:
77
runs-on: "ubuntu-22.04"
8-
name: 📐 Build ${{ matrix.arch }}
8+
name: 📐 Build ${{ matrix.arch.runner }}
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
arch: [
13-
"x86_64-unknown-linux-gnu",
14-
"aarch64-unknown-linux-gnu",
12+
arch:
13+
- id: "x86_64-unknown-linux-gnu"
14+
runner: "ubuntu-22.04"
15+
- id: "aarch64-unknown-linux-gnu"
16+
runner: "ubuntu-24.04-arm"
1517
#"armv7-unknown-linux-gnueabihf", # TODO: fix this, newer godot-rust is failing to build for arm32
1618
#"i686-unknown-linux-gnu"
17-
]
1819
steps:
1920
- uses: actions/checkout@v6
2021
with:
@@ -28,7 +29,6 @@ jobs:
2829
sudo apt-get install build-essential
2930
sudo apt-get install pkg-config
3031
sudo apt-get install libssl-dev
31-
sudo apt-get install gcc-aarch64-linux-gnu
3232
sudo apt-get install zlib1g-dev
3333
# Multi platform build
3434
sudo apt-get install gcc-multilib g++-multilib libc6-dev-i386
@@ -38,17 +38,17 @@ jobs:
3838
- name: Restore Cache
3939
uses: Swatinem/rust-cache@v2
4040
with:
41-
prefix-key: patchwork_rust_plugin_linux-${{ matrix.arch }}
41+
prefix-key: patchwork_rust_plugin_linux-${{ matrix.arch.id }}
4242

4343
- name: Build
4444
uses: ./.github/actions/build-plugin
4545
with:
46-
arch: ${{ matrix.arch }}
46+
arch: ${{ matrix.arch.id }}
4747

4848
- name: Upload
4949
uses: actions/upload-artifact@v4
5050
with:
51-
name: patchwork-build-linux-${{ matrix.arch }}
51+
name: patchwork-build-linux-${{ matrix.arch.id }}
5252
path: ./build/patchwork/*
5353
if-no-files-found: error
5454

Cargo.lock

Lines changed: 0 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ notify-debouncer-mini = { version = "0.7.0", features = [
4545
"macos_fsevent",
4646
] }
4747
rand = "0.9.2"
48-
openssl = { version = "0.10", features = ["vendored"] }
4948

5049
# patchwork_rust_post_build_script = { path = "patchwork_rust_post_build_script" }
5150
serde = { version = "1.0", features = ["derive"] }

0 commit comments

Comments
 (0)