passepartoutvpn/passepartout-apple
1
0
Fork 0
mirror of https://github.com/passepartoutvpn/passepartout-apple.git synced 2025-02-16 12:52:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Xcode version in CI

Browse Source 
Xcode was 12 instead of 12.2 and therefore OpenSSL was failing on
Apple Silicon arch (MacOSX arm64).
This commit is contained in:
Davide De Rosa 2021-01-06 17:35:59 +01:00
parent 7a4b9069c5
commit 8d31bdc22f
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -1,16 +1,16 @@
language: objective-c language: objective-c
osx_image: xcode12 osx_image: xcode12.2
xcode_workspace: Passepartout.xcworkspace xcode_workspace: Passepartout.xcworkspace
xcode_scheme: PassepartoutCore-iOS xcode_scheme: PassepartoutCore-iOS
xcode_destination: platform=iOS Simulator,OS=12.4,name=iPhone Xs Max xcode_destination: platform=iOS Simulator,OS=12.4,name=iPhone Xs Max
cache: cache:
bundler: true bundler: true
cocoapods: true cocoapods: true
install:
- bundle install --jobs=3 --deployment --path=${BUNDLE_PATH:-vendor/bundle}
- bundle exec pod repo update
- travis_wait 40 bundle exec pod install
branches: branches:
only: only:
- master - master
- fix-travis-ci
install:
- bundle install --jobs=3 --deployment --path=${BUNDLE_PATH:-vendor/bundle}
- bundle exec pod repo update
- travis_wait 40 bundle exec pod install --verbose

12
Passepartout.xcodeproj/project.pbxproj
View File

@ -2275,8 +2275,8 @@
baseConfigurationReference = 0376B8FDB39F81CA072C3F37 /* Pods-ios-PassepartoutCore-iOS.debug.xcconfig */; baseConfigurationReference = 0376B8FDB39F81CA072C3F37 /* Pods-ios-PassepartoutCore-iOS.debug.xcconfig */;
buildSettings = { buildSettings = {
APPLICATION_EXTENSION_API_ONLY = NO; APPLICATION_EXTENSION_API_ONLY = NO;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 974; CURRENT_PROJECT_VERSION = 974;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
@ -2308,8 +2308,8 @@
baseConfigurationReference = 5CC1FDDBA184F8548D814E9D /* Pods-ios-PassepartoutCore-iOS.release.xcconfig */; baseConfigurationReference = 5CC1FDDBA184F8548D814E9D /* Pods-ios-PassepartoutCore-iOS.release.xcconfig */;
buildSettings = { buildSettings = {
APPLICATION_EXTENSION_API_ONLY = NO; APPLICATION_EXTENSION_API_ONLY = NO;
CODE_SIGN_IDENTITY = ""; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 974; CURRENT_PROJECT_VERSION = 974;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
@ -2453,7 +2453,7 @@
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 974; CURRENT_PROJECT_VERSION = 974;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = DTDYD63ZX9; DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1; DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath"; DYLIB_INSTALL_NAME_BASE = "@rpath";
@ -2486,7 +2486,7 @@
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 974; CURRENT_PROJECT_VERSION = 974;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = DTDYD63ZX9; DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1; DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath"; DYLIB_INSTALL_NAME_BASE = "@rpath";

2
Submodules/fastlane-ci-templates

@ -1 +1 @@
Subproject commit 88b06fa3cd3f3a525107b02d8d004811f90287d9 Subproject commit 1693aa359b5f74a1f10d0a1a0a1e81010de25eb4