Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert changes attempting to get CI to build for Xcode 14 + macOS 12 + cocoapods #6590

Merged
merged 3 commits into from
Nov 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:

ios:
name: Build for iOS
runs-on: macos-12
runs-on: macos-11
steps:
- uses: actions/[email protected]
- uses: actions/setup-node@v3
Expand All @@ -98,7 +98,7 @@ jobs:
# continue-on-error: true
# with:
# cache_key: ${{ matrix.os }}
- run: sudo xcode-select -s /Applications/Xcode_14.1.app
- run: sudo xcode-select -s /Applications/Xcode_13.1.app
- run: git fetch --prune --unshallow
- run: npm ci
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:

ios-pods:
name: iOS Cocoapods
runs-on: macos-12
runs-on: macos-11
steps:
- uses: actions/[email protected]
- uses: actions/setup-node@v3
Expand All @@ -133,7 +133,7 @@ jobs:
with:
ruby-version: '2.6'
bundler-cache: true
- run: sudo xcode-select -s /Applications/Xcode_14.1.app
- run: sudo xcode-select -s /Applications/Xcode_13.1.app
- run: npm ci
env: {SKIP_POSTINSTALL: '1'}
- run: bundle exec pod install --deployment
Expand Down Expand Up @@ -238,7 +238,7 @@ jobs:
continue-on-error: true
with:
cache_key: ${{ matrix.os }}
- run: sudo xcode-select -s /Applications/Xcode_14.1.app
- run: sudo xcode-select -s /Applications/Xcode_13.1.app
- run: git fetch --prune --unshallow
- run: npm ci
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cocoapods.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
ios-podfile-update:
# Adapted from https://gist.github.com/A-Tokyo/0d811e818513fc4d3272335d2847d748
name: iOS Update Cocoapods
runs-on: macos-12
runs-on: macos-11
if: ${{ github.actor == 'dependabot[bot]' }}
steps:
- uses: actions/[email protected]
Expand All @@ -27,7 +27,7 @@ jobs:
with:
ruby-version: '2.6'
bundler-cache: true
- run: sudo xcode-select -s /Applications/Xcode_14.1.app
- run: sudo xcode-select -s /Applications/Xcode_13.1.app
- run: npm ci
env: {SKIP_POSTINSTALL: '1'}
- run: bundle exec -- pod install --verbose
Expand Down
10 changes: 0 additions & 10 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,6 @@ target 'AllAboutOlaf' do
config.build_settings["CXX"] = "clang++"
config.build_settings["LDPLUSPLUS"] = "clang++"
end

# Workaround for cli builds failing on Xcode 14
# We should be able to remove this once CocoaPods catches up to it
# react-native issue: https://github.com/facebook/react-native/issues/34673
# cocoapods issue: https://github.com/CocoaPods/CocoaPods/issues/11402
if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"
target.build_configurations.each do |config|
config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
end
end
end
end
end
2 changes: 1 addition & 1 deletion ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,6 @@ SPEC CHECKSUMS:
Yoga: 2f6a78c58dcc2963bd8e34d96a4246d9dff2e3a7
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

PODFILE CHECKSUM: 38ee0eeef55ab8c2665f634e3bb69c4ef965e110
PODFILE CHECKSUM: beadf17ef4e816508151c3d09fd800f19958dddc

COCOAPODS: 1.11.3