Skip to content

Commit

Permalink
ci: use older builders
Browse files Browse the repository at this point in the history
  • Loading branch information
theomonnom committed Dec 8, 2023
1 parent 4203594 commit 4a97c70
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,23 @@ jobs:
- os: windows-2019
target: aarch64-pc-windows-msvc
#extraargs: --exclude livekit-api --exclude livekit-ffi # waiting for v0.17 of ring
- os: macos-latest
- os: macos-11
target: x86_64-apple-darwin
- os: macos-latest
- os: macos-11
target: aarch64-apple-darwin
- os: macos-latest
- os: macos-11
target: aarch64-apple-ios
- os: macos-latest
- os: macos-11
target: aarch64-apple-ios-sim
- os: ubuntu-latest
- os: ubuntu-20.04
target: x86_64-unknown-linux-gnu
- os: buildjet-4vcpu-ubuntu-2204-arm
target: aarch64-unknown-linux-gnu
- os: ubuntu-latest
- os: ubuntu-20.04
target: aarch64-linux-android
- os: ubuntu-latest
- os: ubuntu-20.04
target: armv7-linux-androideabi
- os: ubuntu-latest
- os: ubuntu-20.04
target: x86_64-linux-android


Expand All @@ -62,7 +62,7 @@ jobs:
submodules: true

- name: Install linux dependencies
if: ${{ matrix.os == 'ubuntu-latest' || matrix.os == 'buildjet-4vcpu-ubuntu-2204-arm'}}
if: ${{ matrix.os == 'ubuntu-20.04' || matrix.os == 'buildjet-4vcpu-ubuntu-2204-arm'}}
run: |
sudo apt update -y
sudo apt install -y libssl-dev libx11-dev libgl1-mesa-dev libxext-dev
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/ffi-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,31 +40,31 @@ jobs:
buildargs: --no-default-features --features "native-tls" # ring 0.16 is incompatible with win aarch64
target: aarch64-pc-windows-msvc
name: ffi-windows-arm64
- os: macos-latest
- os: macos-11
platform: macos
dylib: liblivekit_ffi.dylib
target: x86_64-apple-darwin
macosx_deployment_target: "10.15"
name: ffi-macos-x86_64
- os: macos-latest
- os: macos-11
platform: macos
dylib: liblivekit_ffi.dylib
target: aarch64-apple-darwin
macosx_deployment_target: "11.0" # aarch64 requires 11
name: ffi-macos-arm64
- os: macos-latest
- os: macos-11
platform: ios
dylib: liblivekit_ffi.dylib
target: aarch64-apple-ios
iphoneos_deployment_target: "13.0"
name: ffi-ios-arm64
- os: macos-latest
- os: macos-11
platform: ios
dylib: liblivekit_ffi.dylib
target: aarch64-apple-ios-sim
iphoneos_deployment_target: "13.0"
name: ffi-ios-sim-arm64
- os: ubuntu-latest
- os: ubuntu-20.04
platform: linux
build_image: quay.io/pypa/manylinux_2_28_x86_64
dylib: liblivekit_ffi.so
Expand All @@ -76,17 +76,17 @@ jobs:
dylib: liblivekit_ffi.so
target: aarch64-unknown-linux-gnu
name: ffi-linux-arm64
- os: ubuntu-latest
- os: ubuntu-20.04
platform: android
dylib: liblivekit_ffi.so
target: aarch64-linux-android
name: ffi-android-arm64
- os: ubuntu-latest
- os: ubuntu-20.04
platform: android
dylib: liblivekit_ffi.so
target: armv7-linux-androideabi
name: ffi-android-armv7
- os: ubuntu-latest
- os: ubuntu-20.04
platform: android
dylib: liblivekit_ffi.so
target: x86_64-linux-android
Expand Down Expand Up @@ -158,14 +158,14 @@ jobs:

# zip the files
- name: Zip artifact (Unix)
if: ${{ matrix.os != 'windows-latest' }}
if: ${{ matrix.os != 'windows-2019' }}
run: |
cp livekit-ffi/include/livekit_ffi.h target/${{ matrix.target }}/release/
cd target/${{ matrix.target }}/release/
zip ${{ github.workspace }}/${{ matrix.name }}.zip ${{ matrix.dylib }} livekit_ffi.h LICENSE.md
- name: Zip artifact (Windows)
if: ${{ matrix.os == 'windows-latest' }}
if: ${{ matrix.os == 'windows-2019' }}
run: |
cp livekit-ffi/include/livekit_ffi.h target/${{ matrix.target }}/release/
cd target/${{ matrix.target }}/release/
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ jobs:
# Platform supports is limited for tests (no aarch64)
- os: windows-2019
target: x86_64-pc-windows-msvc
- os: macos-latest
- os: macos-11
target: x86_64-apple-darwin
- os: ubuntu-latest
- os: ubuntu-20.04
target: x86_64-unknown-linux-gnu

name: Test (${{ matrix.target }})
Expand All @@ -47,7 +47,7 @@ jobs:
rustup target add ${{ matrix.target }}
- name: Install linux dependencies
if: ${{ matrix.os == 'ubuntu-latest' }}
if: ${{ matrix.os == 'ubuntu-20.04' }}
run: |
sudo apt update -y
sudo apt install -y libssl-dev libx11-dev libgl1-mesa-dev libxext-dev
Expand Down

0 comments on commit 4a97c70

Please sign in to comment.