55
55
with :
56
56
components : rustfmt
57
57
- name : " Check rustfmt"
58
- run : cargo fmt --all -- --check;
58
+ run : cargo fmt --all -- --check
59
59
60
60
clippy :
61
61
name : clippy${{ matrix.rust.postfix }}
77
77
rust : ${{ matrix.rust.toolchain }}
78
78
components : clippy
79
79
- name : " Check clippy"
80
- run : cargo clippy --workspace --features ${GDRUST_FEATURES} -- -D clippy::style -D clippy::complexity -D clippy::perf -D clippy::dbg_macro -D clippy::todo -D clippy::unimplemented;
80
+ run : cargo clippy --workspace --features ${GDRUST_FEATURES} -- -D clippy::style -D clippy::complexity -D clippy::perf -D clippy::dbg_macro -D clippy::todo -D clippy::unimplemented
81
81
82
82
cargo-deny :
83
83
runs-on : ubuntu-latest
@@ -134,9 +134,9 @@ jobs:
134
134
uses : ./.github/composite/llvm
135
135
if : ${{ matrix.os.id == 'windows-latest' }}
136
136
- name : " Compile tests"
137
- run : cargo test --workspace --features ${GDRUST_FEATURES} --no-run;
137
+ run : cargo test --workspace --features ${GDRUST_FEATURES} --no-run
138
138
- name : " Test"
139
- run : cargo test --workspace --features ${GDRUST_FEATURES} ${{ matrix.testflags }};
139
+ run : cargo test --workspace --features ${GDRUST_FEATURES} ${{ matrix.testflags }}
140
140
141
141
build-release :
142
142
name : build-release-${{ matrix.os.name }}
@@ -162,7 +162,7 @@ jobs:
162
162
uses : ./.github/composite/llvm
163
163
if : ${{ matrix.os.id == 'windows-latest' }}
164
164
- name : " Release build (check only)"
165
- run : cargo check --release;
165
+ run : cargo check --release
166
166
167
167
build-ios :
168
168
needs : rustfmt
@@ -179,21 +179,21 @@ jobs:
179
179
# rust: ${{ matrix.rust.toolchain }}
180
180
- name : " Install cargo-dinghy"
181
181
run : |
182
- rustup target add x86_64-apple-ios;
183
- curl -L https://github.com/sonos/dinghy/releases/download/0.4.62/cargo-dinghy-macos-0.4.62.tgz -o cargo-dinghy-macos.tar.gz;
184
- tar -zxvf cargo-dinghy-macos.tar.gz;
185
- mkdir -p $HOME/.cargo/bin;
186
- cp cargo-dinghy-0.4.62/cargo-dinghy $HOME/.cargo/bin;
182
+ rustup target add x86_64-apple-ios
183
+ curl -L https://github.com/sonos/dinghy/releases/download/0.4.62/cargo-dinghy-macos-0.4.62.tgz -o cargo-dinghy-macos.tar.gz
184
+ tar -zxvf cargo-dinghy-macos.tar.gz
185
+ mkdir -p $HOME/.cargo/bin
186
+ cp cargo-dinghy-0.4.62/cargo-dinghy $HOME/.cargo/bin
187
187
- name : " Cross-compile to iOS"
188
188
run : |
189
- RUNTIME_ID=$(xcrun simctl list runtimes | grep iOS | cut -d ' ' -f 7 | tail -1);
190
- export SIM_ID=$(xcrun simctl create My-iphone11 com.apple.CoreSimulator.SimDeviceType.iPhone-11 $RUNTIME_ID);
191
- xcrun simctl boot $SIM_ID;
192
- cd gdnative-core;
193
- cargo dinghy --platform auto-ios-x86_64 test;
194
- cd ..;
195
- cd gdnative-sys;
196
- cargo dinghy --platform auto-ios-x86_64 test;
189
+ RUNTIME_ID=$(xcrun simctl list runtimes | grep iOS | cut -d ' ' -f 7 | tail -1)
190
+ export SIM_ID=$(xcrun simctl create My-iphone11 com.apple.CoreSimulator.SimDeviceType.iPhone-11 $RUNTIME_ID)
191
+ xcrun simctl boot $SIM_ID
192
+ cd gdnative-core
193
+ cargo dinghy --platform auto-ios-x86_64 test
194
+ cd ..
195
+ cd gdnative-sys
196
+ cargo dinghy --platform auto-ios-x86_64 test
197
197
198
198
build-android :
199
199
# Note: even though Android builds for another architecture than Linux, it can reuse downloaded crates (source code, maybe 'cargo check').
@@ -211,16 +211,16 @@ jobs:
211
211
# rust: ${{ matrix.rust.toolchain }}
212
212
- name : " Install Java + NDK"
213
213
run : |
214
- # aarch64 and armv7 cover most Android phones & tablets.;
215
- rustup target add aarch64-linux-android armv7-linux-androideabi;
216
- sudo apt-get update;
217
- sudo apt-get install llvm-dev libclang-dev clang g++-multilib gcc-multilib libc6-dev libc6-dev-arm64-cross;
214
+ # aarch64 and armv7 cover most Android phones & tablets.
215
+ rustup target add aarch64-linux-android armv7-linux-androideabi
216
+ sudo apt-get update
217
+ sudo apt-get install llvm-dev libclang-dev clang g++-multilib gcc-multilib libc6-dev libc6-dev-arm64-cross
218
218
- name : " Build Rust for targets: aarch64-linux-android, armv7-linux-androideabi"
219
219
run : |
220
220
export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=$ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang++
221
221
export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=$ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang++
222
- cargo build --target aarch64-linux-android --release;
223
- cargo build --target armv7-linux-androideabi --release;
222
+ cargo build --target aarch64-linux-android --release
223
+ cargo build --target armv7-linux-androideabi --release
224
224
env :
225
225
ANDROID_NDK_VERSION : 21.4.7075529
226
226
0 commit comments