Skip to content

Commit 041e58d

Browse files
danrmillerdanrmiller
committed
Bump all platforms to Rust 1.89.0, drop Android OpenSSL version caps
1 parent 3957652 commit 041e58d

7 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Run tests
2626
run: |
2727
cd src/serai
28-
cargo +1.71.0 test --workspace --exclude bitcoin-serai
28+
cargo +1.89.0 test --workspace --exclude bitcoin-serai
2929
3030
build-linux:
3131
needs: test
@@ -45,7 +45,7 @@ jobs:
4545
submodules: recursive
4646

4747
- name: Add Rust target
48-
run: rustup +1.71.0 target add ${{ matrix.target }}
48+
run: rustup +1.89.0 target add ${{ matrix.target }}
4949

5050
- uses: Swatinem/rust-cache@v2
5151
with:
@@ -57,7 +57,7 @@ jobs:
5757
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
5858
run: |
5959
cd src/serai/hrf
60-
cargo +1.71.0 build --target ${{ matrix.target }} --release --lib
60+
cargo +1.89.0 build --target ${{ matrix.target }} --release --lib
6161
cp ../target/${{ matrix.target }}/release/libhrf_api.so \
6262
../../../${{ matrix.asset }}
6363
@@ -86,7 +86,7 @@ jobs:
8686
submodules: recursive
8787

8888
- name: Add Rust target
89-
run: rustup +1.71.0 target add ${{ matrix.target }}
89+
run: rustup +1.89.0 target add ${{ matrix.target }}
9090

9191
- uses: Swatinem/rust-cache@v2
9292
with:
@@ -98,8 +98,8 @@ jobs:
9898
ANDROID_NDK_ROOT: /opt/android-ndk-r28
9999
run: |
100100
cd src/serai/hrf
101-
sed -i 's/\[dependencies\]/[dependencies]\nopenssl = { version = "<=0.10.78", features = ["vendored"] }\nopenssl-sys = "<=0.9.114"/' Cargo.toml
102-
cargo +1.71.0 ndk --target ${{ matrix.target }} --platform 21 build --release
101+
sed -i 's/\[dependencies\]/[dependencies]\nopenssl = { version = "0.10", features = ["vendored"] }/' Cargo.toml
102+
cargo +1.89.0 ndk --target ${{ matrix.target }} --platform 21 build --release
103103
cp ../target/${{ matrix.target }}/release/libhrf_api.so \
104104
../../../frostdart-android-${{ matrix.abi }}.so
105105
@@ -119,7 +119,7 @@ jobs:
119119
submodules: recursive
120120

121121
- name: Add Rust target
122-
run: rustup +1.71.0 target add x86_64-pc-windows-gnu
122+
run: rustup +1.89.0 target add x86_64-pc-windows-gnu
123123

124124
- uses: Swatinem/rust-cache@v2
125125
with:
@@ -128,7 +128,7 @@ jobs:
128128
- name: Build
129129
run: |
130130
cd src/serai/hrf
131-
cargo +1.71.0 build --target x86_64-pc-windows-gnu --release --lib
131+
cargo +1.89.0 build --target x86_64-pc-windows-gnu --release --lib
132132
cp ../target/x86_64-pc-windows-gnu/release/hrf_api.dll \
133133
../../../frostdart-windows-x86_64.dll
134134
@@ -147,7 +147,7 @@ jobs:
147147

148148
- uses: dtolnay/rust-toolchain@master
149149
with:
150-
toolchain: '1.71.0'
150+
toolchain: '1.89.0'
151151
targets: aarch64-apple-ios
152152

153153
- uses: Swatinem/rust-cache@v2
@@ -179,7 +179,7 @@ jobs:
179179

180180
- uses: dtolnay/rust-toolchain@master
181181
with:
182-
toolchain: '1.71.0'
182+
toolchain: '1.89.0'
183183
targets: aarch64-apple-darwin
184184

185185
- uses: Swatinem/rust-cache@v2

‎scripts/android/build_all.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ cd build/serai/hrf || exit
4343

4444
# inject vendored openssl required for android cross compilation
4545
sed -i "s/\[dependencies\]/\[dependencies\]\\
46-
openssl = { version = \"<=0.10.78\", features = [\"vendored\"] }\\
47-
openssl-sys = \"<=0.9.114\"/" Cargo.toml
46+
openssl = { version = \"0.10\", features = [\"vendored\"] }/" Cargo.toml
4847

4948
rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android
5049
cargo ndk \

‎scripts/ios/build_all.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ sed -i '' 's/^name = "hrf-api"$/name = "frostdart"/' Cargo.toml
1313

1414
export IPHONEOS_DEPLOYMENT_TARGET=15.0
1515
export RUSTFLAGS="-C link-arg=-mios-version-min=15.0"
16-
cargo build --target aarch64-apple-ios --release --lib
16+
cargo +1.89.0 build --target aarch64-apple-ios --release --lib
1717

1818
cp ../target/aarch64-apple-ios/release/libfrostdart.a \
1919
"$LIB_ROOT/../ios/libfrostdart.a"

‎scripts/linux/build_all.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ rm -rf "$ROOT_DIR"/src/serai/target
99
cd "$ROOT_DIR"/src/serai/hrf || exit
1010
if [ "$IS_ARM" = true ] ; then
1111
echo "Building arm frostdart"
12-
cargo +1.71.0 build --target aarch64-unknown-linux-gnu --release --lib
12+
cargo +1.89.0 build --target aarch64-unknown-linux-gnu --release --lib
1313
cp ../target/aarch64-unknown-linux-gnu/release/libhrf_api.so "$ROOT_DIR"/scripts/linux/build/frostdart.so
1414
else
1515
echo "Building x86_64 frostdart"
16-
cargo +1.71.0 build --target x86_64-unknown-linux-gnu --release --lib
16+
cargo +1.89.0 build --target x86_64-unknown-linux-gnu --release --lib
1717
cp ../target/x86_64-unknown-linux-gnu/release/libhrf_api.so "$ROOT_DIR"/scripts/linux/build/frostdart.so
1818
fi

‎scripts/macos/build_macos.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Future<void> main(List<String> args) async {
2828
await _run("sed", ["-i", ".bak", "s/frostdart/hrf-api/", "cargo.toml"]);
2929

3030
await _run("cargo", [
31+
"+1.89.0",
3132
"lipo",
3233
"--release",
3334
"--targets",

‎scripts/windows/build_all.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@echo on
22

3-
rem Rust 1.71.0 Windows toolchain required,
4-
rem `rustup toolchain install 1.71.0-x86_64-pc-windows-msvc`.
3+
rem Rust 1.89.0 Windows toolchain required,
4+
rem `rustup toolchain install 1.89.0-x86_64-pc-windows-msvc`.
55

66
set ROOT_DIR=%cd%\..\..
77

@@ -12,10 +12,10 @@ rmdir /s /q "%ROOT_DIR%\src\serai\target" 2>nul
1212
cd "%ROOT_DIR%\src\serai\hrf" || exit
1313
if "%IS_ARM%"=="true" (
1414
echo Building arm frostdart
15-
cargo +1.71.0 build --target aarch64-pc-windows-msvc --release --lib
15+
cargo +1.89.0 build --target aarch64-pc-windows-msvc --release --lib
1616
copy "..\target\x86_64-pc-windows-msvc\release\hrf_api.dll" "%ROOT_DIR%\scripts\windows\build\frostdart.dll"
1717
) else (
1818
echo Building x86_64 frostdart
19-
cargo +1.71.0 build --target x86_64-pc-windows-msvc --release --lib
19+
cargo +1.89.0 build --target x86_64-pc-windows-msvc --release --lib
2020
copy "..\target\x86_64-pc-windows-msvc\release\hrf_api.dll" "%ROOT_DIR%\scripts\windows\build\frostdart.dll"
2121
)

‎scripts/windows/build_all.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ cd "$ROOT_DIR"/src/serai/hrf || exit
1111
if [ "$IS_ARM" = true ] ; then
1212
echo "Building arm frostdart with GNU toolchain."
1313
echo "WARNING: aarch64-pc-windows-gnu may not be fully supported."
14-
rustup +1.71.0 target add aarch64-pc-windows-gnu
15-
cargo +1.71.0 build --target aarch64-pc-windows-gnu --release --lib
14+
rustup +1.89.0 target add aarch64-pc-windows-gnu
15+
cargo +1.89.0 build --target aarch64-pc-windows-gnu --release --lib
1616
cp ../target/aarch64-pc-windows-gnu/release/hrf_api.dll "$ROOT_DIR"/scripts/windows/build/frostdart.dll
1717
else
1818
echo "Adding x86_64-pc-windows-gnu target."
19-
rustup +1.71.0 target add x86_64-pc-windows-gnu
19+
rustup +1.89.0 target add x86_64-pc-windows-gnu
2020
echo "Building x86_64 frostdart with GNU toolchain."
21-
cargo +1.71.0 build --target x86_64-pc-windows-gnu --release --lib
21+
cargo +1.89.0 build --target x86_64-pc-windows-gnu --release --lib
2222
cp ../target/x86_64-pc-windows-gnu/release/hrf_api.dll "$ROOT_DIR"/scripts/windows/build/frostdart.dll
2323
fi

0 commit comments

Comments
 (0)