diff options
| author | Bug Magnet <marco.nikic@mullvad.net> | 2024-03-11 11:09:52 +0100 |
|---|---|---|
| committer | Bug Magnet <marco.nikic@mullvad.net> | 2024-03-11 11:09:52 +0100 |
| commit | 298f523ea74dac84fbdf57ad3eca4d18993dd13b (patch) | |
| tree | e1333aac8480a3b8aabae118c645e27d49c14b21 | |
| parent | 485438709a80282f84f7778f4f14cf45c2ee5180 (diff) | |
| parent | 77f6dbfe3937a54e70cef7d112064f06f9e6bacf (diff) | |
| download | mullvadvpn-298f523ea74dac84fbdf57ad3eca4d18993dd13b.tar.xz mullvadvpn-298f523ea74dac84fbdf57ad3eca4d18993dd13b.zip | |
Merge branch 'add-disableautomaticpackageresolution-to-xcodebuild-command-ios-550'
| -rw-r--r-- | .github/workflows/ios-end-to-end-tests.yml | 1 | ||||
| -rw-r--r-- | .github/workflows/ios-screenshots-tests.yml | 1 | ||||
| -rw-r--r-- | .github/workflows/ios-validate-build-schemas.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/ios.yml | 1 | ||||
| -rwxr-xr-x | ios/build.sh | 4 |
5 files changed, 9 insertions, 1 deletions
diff --git a/.github/workflows/ios-end-to-end-tests.yml b/.github/workflows/ios-end-to-end-tests.yml index 7c6ba0e90a..593f84db61 100644 --- a/.github/workflows/ios-end-to-end-tests.yml +++ b/.github/workflows/ios-end-to-end-tests.yml @@ -57,6 +57,7 @@ jobs: -configuration Debug \ -testPlan MullvadVPNUITestsSmoke \ -destination "platform=iOS,id=$TEST_DEVICE_UDID" \ + -disableAutomaticPackageResolution \ test 2>&1 | xcbeautify --report junit --report-path test-report working-directory: ios/ diff --git a/.github/workflows/ios-screenshots-tests.yml b/.github/workflows/ios-screenshots-tests.yml index b71e372a3a..e4173634ee 100644 --- a/.github/workflows/ios-screenshots-tests.yml +++ b/.github/workflows/ios-screenshots-tests.yml @@ -72,5 +72,6 @@ jobs: -testPlan MullvadVPNScreenshots \ -destination "platform=iOS Simulator,name=iPhone 15" \ -clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH" \ + -disableAutomaticPackageResolution \ test 2>&1 | xcbeautify working-directory: ios/ diff --git a/.github/workflows/ios-validate-build-schemas.yml b/.github/workflows/ios-validate-build-schemas.yml index 13e9e31f7e..d2a042182a 100644 --- a/.github/workflows/ios-validate-build-schemas.yml +++ b/.github/workflows/ios-validate-build-schemas.yml @@ -72,6 +72,7 @@ jobs: -configuration MockRelease \ -destination "platform=iOS Simulator,name=iPhone 15" \ -clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH" \ + -disableAutomaticPackageResolution \ build set -o pipefail && env NSUnbufferedIO=YES xcodebuild \ -project MullvadVPN.xcodeproj \ @@ -79,6 +80,7 @@ jobs: -configuration Staging \ -destination "platform=iOS Simulator,name=iPhone 15" \ -clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH" \ + -disableAutomaticPackageResolution \ build set -o pipefail && env NSUnbufferedIO=YES xcodebuild \ -project MullvadVPN.xcodeproj \ @@ -86,5 +88,6 @@ jobs: -configuration Debug \ -destination "platform=iOS Simulator,name=iPhone 15" \ -clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH" \ + -disableAutomaticPackageResolution \ build working-directory: ios/ diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index ba5cb823f4..f7f69c4e45 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -98,5 +98,6 @@ jobs: -testPlan MullvadVPNCI \ -destination "platform=iOS Simulator,name=iPhone 15" \ -clonedSourcePackagesDirPath "$SOURCE_PACKAGES_PATH" \ + -disableAutomaticPackageResolution \ test 2>&1 | xcbeautify working-directory: ios/ diff --git a/ios/build.sh b/ios/build.sh index 2d2e8a649c..8a48a5d17c 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -93,6 +93,7 @@ release_build() { -sdk iphoneos \ -configuration Release \ -derivedDataPath "$DERIVED_DATA_DIR" \ + -disableAutomaticPackageResolution \ "$@" } @@ -107,4 +108,5 @@ xcodebuild \ -exportArchive \ -archivePath "$XCODE_ARCHIVE_DIR" \ -exportOptionsPlist "$EXPORT_OPTIONS_PATH" \ - -exportPath "$BUILD_OUTPUT_DIR" + -exportPath "$BUILD_OUTPUT_DIR" \ + -disableAutomaticPackageResolution |