Skip to content

Commit

Permalink
Housekeeping
Browse files Browse the repository at this point in the history
Remove local env config that shouldn't be in version control
Fixed Android CI by updating java version
Tried to fix iOS CI (no luck yet)
  • Loading branch information
evan-masseau authored Jan 3, 2024
1 parent 0605fb9 commit c273945
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '11'
java-version: '17'

- name: Finalize Android SDK
if: env.turbo_cache_hit != 1
Expand All @@ -102,13 +102,18 @@ jobs:
yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}"
build-ios:
runs-on: macos-latest
runs-on: macos-13-xlarge
env:
TURBO_CACHE_DIR: .turbo/ios
DEVELOPER_DIR: /Applications/Xcode_15.1.app/Contents/Developer
steps:
- name: Checkout
uses: actions/checkout@v3

- uses: ruby/setup-ruby@v1
with:
ruby-version: '3.2.2'

- name: Setup
uses: ./.github/actions/setup

Expand Down Expand Up @@ -143,6 +148,7 @@ jobs:
if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true'
run: |
yarn pod-install example/ios
brew install watchman
env:
NO_FLIPPER: 1

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ DerivedData
*.ipa
*.xcuserstate
project.xcworkspace
.xcode.env.local

# Android/IJ
#
Expand Down
2 changes: 0 additions & 2 deletions example/ios/.xcode.env.local

This file was deleted.

2 changes: 1 addition & 1 deletion example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1385,4 +1385,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 4b9faf5e512fab6e8d87beb30570ec4d3bd884b9

COCOAPODS: 1.14.2
COCOAPODS: 1.14.3

0 comments on commit c273945

Please sign in to comment.