0
0
mirror of https://github.com/signalapp/libsignal.git synced 2024-09-20 03:52:17 +02:00

CI: Build Java release Mac binaries using macos-latest (arm64)

...instead of macos-12 (x86_64)
This commit is contained in:
Jordan Rose 2024-07-31 10:54:44 -07:00
parent 11544c6718
commit 5a29f08ffb

View File

@ -21,11 +21,11 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [windows-latest, macos-12] os: [windows-latest, macos-latest]
include: include:
- os: windows-latest - os: windows-latest
- os: macos-12 - os: macos-latest
additional-rust-target: aarch64-apple-darwin additional-rust-target: x86_64-apple-darwin
# Ubuntu binaries are built using Docker, below # Ubuntu binaries are built using Docker, below
timeout-minutes: 45 timeout-minutes: 45
@ -64,7 +64,7 @@ jobs:
if: matrix.os == 'windows-latest' if: matrix.os == 'windows-latest'
- run: brew install protobuf - run: brew install protobuf
if: matrix.os == 'macos-12' if: matrix.os == 'macos-latest'
- name: Build client for host - name: Build client for host
run: java/build_jni.sh desktop run: java/build_jni.sh desktop
@ -76,13 +76,13 @@ jobs:
- name: Build client for alternate target - name: Build client for alternate target
run: java/build_jni.sh desktop run: java/build_jni.sh desktop
if: matrix.os == 'macos-12' if: matrix.os == 'macos-latest'
env: env:
CARGO_BUILD_TARGET: ${{ matrix.additional-rust-target }} CARGO_BUILD_TARGET: ${{ matrix.additional-rust-target }}
- name: Build server for alternate target - name: Build server for alternate target
run: java/build_jni.sh server run: java/build_jni.sh server
if: matrix.os == 'macos-12' if: matrix.os == 'macos-latest'
env: env:
CARGO_BUILD_TARGET: ${{ matrix.additional-rust-target }} CARGO_BUILD_TARGET: ${{ matrix.additional-rust-target }}