Skip to content

Commit

Permalink
chore: move macos build to arm64 (#228)
Browse files Browse the repository at this point in the history
* test

* disable cache

* test

* test all builds

* fix conditions
  • Loading branch information
leanmendoza authored Feb 9, 2024
1 parent 301a7bd commit 7e27fed
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ jobs:
if: ${{ github.ref == 'refs/heads/main' }}
strategy:
matrix:
os: [self-hosted-windows, ubuntu-latest, macos-latest]
os: [self-hosted-windows, ubuntu-latest, macos-14-xlarge]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand All @@ -172,6 +172,7 @@ jobs:
override: true

- name: Set up cargo cache
if: runner.os != 'macos'
uses: actions/cache@v3
with:
path: |
Expand Down
4 changes: 2 additions & 2 deletions godot/export_presets.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ codesign/entitlements/allow_jit_code_execution=true
codesign/entitlements/allow_unsigned_executable_memory=true
codesign/entitlements/allow_dyld_environment_variables=true
codesign/entitlements/disable_library_validation=true
codesign/entitlements/audio_input=false
codesign/entitlements/audio_input=true
codesign/entitlements/camera=false
codesign/entitlements/location=false
codesign/entitlements/address_book=false
Expand All @@ -109,7 +109,7 @@ codesign/entitlements/app_sandbox/files_user_selected=0
codesign/entitlements/app_sandbox/helper_executables=[]
codesign/custom_options=PackedStringArray()
notarization/notarization=0
privacy/microphone_usage_description=""
privacy/microphone_usage_description="The microphone is used in the voice-chat, it only records while you're pushing the microphone button."
privacy/microphone_usage_description_localized={}
privacy/camera_usage_description=""
privacy/camera_usage_description_localized={}
Expand Down
4 changes: 2 additions & 2 deletions rust/decentraland-godot-lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ethers = { version = "2.0", features = ["rustls"] }
async-trait = "0.1.68"

cpal = { version = "0.15.2", optional = true }
ffmpeg-next = { git = "https://github.com/decentraland/rust-ffmpeg/", branch="audioline-and-mobile-fix", optional = true }
ffmpeg-next = { git = "https://github.com/decentraland/rust-ffmpeg/", branch="audioline-and-mobile-fix-6.1", optional = true }

thiserror = "1.0"
anyhow = "1.0.70"
Expand Down Expand Up @@ -65,7 +65,7 @@ multipart = { version = "0.18.0", default-features = false, features = ["client"
ethers-providers = { version = "2.0", features = ["ws","rustls"] }

[target.'cfg(target_os = "android")'.dependencies]
ffmpeg-next = { git = "https://github.com/decentraland/rust-ffmpeg/", branch = "audioline-and-mobile-fix", features = ["fix_usize_size_t"], optional = true }
ffmpeg-next = { git = "https://github.com/decentraland/rust-ffmpeg/", branch = "audioline-and-mobile-fix-6.1", features = ["fix_usize_size_t"], optional = true }
jni = { version = "0.21.1", features = ["invocation"] }
paranoid-android = "0.2.1"

Expand Down

0 comments on commit 7e27fed

Please sign in to comment.