diff --git a/.buildkite/expo-pipeline.yml b/.buildkite/expo-pipeline.yml index aa42ca97c7..f0a8bf727b 100644 --- a/.buildkite/expo-pipeline.yml +++ b/.buildkite/expo-pipeline.yml @@ -74,7 +74,7 @@ steps: - label: ':docker: Build expo IPA' timeout_in_minutes: 20 agents: - queue: "opensource-mac" + queue: "opensource-mac-expo" env: EXPO_RELEASE_CHANNEL: ${BUILDKITE_BUILD_ID} artifact_paths: build/output.ipa diff --git a/.buildkite/react-native-pipeline.yml b/.buildkite/react-native-pipeline.yml index 6f26432b7c..6f28094378 100644 --- a/.buildkite/react-native-pipeline.yml +++ b/.buildkite/react-native-pipeline.yml @@ -32,7 +32,7 @@ steps: - label: ':ios: Build React-native 0.60 ipa' agents: - queue: "opensource-mac" + queue: "opensource-mac-rn" env: REACT_NATIVE_VERSION: rn0.60 artifact_paths: build/rn0.60.ipa @@ -50,7 +50,7 @@ steps: - label: ':ios: Build React-native 0.63 ipa' agents: - queue: "opensource-mac" + queue: "opensource-mac-rn" env: REACT_NATIVE_VERSION: rn0.63 artifact_paths: build/rn0.63.ipa diff --git a/TESTING.md b/TESTING.md index e846281309..06c459b290 100644 --- a/TESTING.md +++ b/TESTING.md @@ -144,27 +144,7 @@ EXPO_PASSWORD=xxx \ npm run test:expo:android ``` -To run against an iOS device, several additional details are required. In order to provision the app the `Expotest.mobileprovision` and its accompanying certificates need to be downloaded from the shared engineering document store and additional environment variables need to be set: - -- `APPLE_TEAM_ID`: The team ID to use when building the application -- `EXPO_PROVISIONING_PROFILE_PATH`: The path to the `Expotest.mobileprovision` file as mentioned above -- `EXPO_P12_PATH`: The path to the `Certificates.p12` file as mentioned above -- `EXPO_IOS_DIST_P12_PASSWORD`: The password required for the above certificate - -To run against an iOS device: - -```sh -DEVICE_TYPE=IOS_10 \ -BROWSER_STACK_USERNAME=xxx \ -BROWSER_STACK_ACCESS_KEY=xxx \ -EXPO_USERNAME=xxx \ -EXPO_PASSWORD=xxx \ -APPLE_TEAM_ID=xxx \ -EXPO_PROVISIONING_PROFILE_PATH=xxx \ -EXPO_P12_PATH=xxx \ -EXPO_IOS_DIST_P12_PASSWORD=xxx \ - npm run test:expo:ios -``` +Running tests against an iOS device locally is not currently supported. ### React-native diff --git a/package.json b/package.json index 956a169640..0b1a1b8f63 100644 --- a/package.json +++ b/package.json @@ -67,14 +67,12 @@ "test:build-browser-container": "docker-compose up --build minimal-packager && docker-compose build --pull browser-maze-runner", "test:build-node-container": "docker-compose up --build minimal-packager && docker-compose build --pull node-maze-runner", "test:build-expo-android-container": "test/expo/scripts/build-android-locally.sh", - "test:build-expo-ios-container": "EXPO_RELEASE_CHANNEL=localtest test/expo/scripts/build-ios-locally.sh", "test:build-react-native-android-container": "test/react-native/scripts/build-android-locally.js", "test:build-react-native-ios": "node -e 'require(\"./scripts/react-native-helper\").buildIOS()'", "test:build-react-native-maze-runner": "docker-compose build --pull react-native-maze-runner", "test:browser": "npm run test:build-browser-container && docker-compose run --use-aliases browser-maze-runner", "test:node": "npm run test:build-node-container && docker-compose run --use-aliases node-maze-runner", "test:expo:android": "npm run test:build-expo-android-container && APP_LOCATION=build/output.apk docker-compose run --use-aliases expo-maze-runner", - "test:expo:ios": "npm run test:build-expo-ios-container && APP_LOCATION=build/output.ipa docker-compose run --use-aliases expo-maze-runner", "test:react-native:android": "npm run test:build-react-native-android-container && APP_LOCATION=build/$REACT_NATIVE_VERSION.apk docker-compose run --use-aliases react-native-maze-runner", "test:react-native:ios": "npm run test:build-react-native-ios && npm run test:build-react-native-maze-runner && APP_LOCATION=build/$REACT_NATIVE_VERSION.ipa docker-compose run --use-aliases react-native-maze-runner" } diff --git a/test/expo/scripts/build-ios-locally.sh b/test/expo/scripts/build-ios-locally.sh deleted file mode 100755 index 480816f57c..0000000000 --- a/test/expo/scripts/build-ios-locally.sh +++ /dev/null @@ -1,20 +0,0 @@ -#! - -set -e - -docker-compose build expo-publisher -docker-compose run expo-publisher - -cd test/expo/features/fixtures/test-app && \ -npm i turtle-cli@0.14 bunyan --no-save --no-package-lock && \ -perl -0777 -i.original -pe "s/entitlements\\['aps-environment'\\] =[^;]+;//gs" node_modules/\@expo/xdl/build/detach/IosNSBundle.js && \ -perl -0777 -i.original -pe "s/entitlements\\['aps-environment'\\] =[^;]+;//gs" node_modules/turtle-cli/node_modules/\@expo/xdl/build/detach/IosNSBundle.js && \ -node_modules/.bin/turtle build:ios \ - -c test/expo/features/fixtures/test-app/app.json \ - --team-id $APPLE_TEAM_ID \ - --dist-p12-path $EXPO_P12_PATH \ - --provisioning-profile-path $EXPO_PROVISIONING_PROFILE_PATH \ - --release-channel $EXPO_RELEASE_CHANNEL \ - -o build/output.ipa - -docker-compose build expo-maze-runner diff --git a/test/expo/scripts/build-ios.sh b/test/expo/scripts/build-ios.sh index 51168bb5fb..ce3c47d956 100755 --- a/test/expo/scripts/build-ios.sh +++ b/test/expo/scripts/build-ios.sh @@ -5,10 +5,7 @@ set -e # Lets make sure the build folder was cleared out correctly rm -rf $BUILDKITE_BUILD_CHECKOUT_PATH/build/* cd test/expo/features/fixtures/test-app -npm i turtle-cli@0.14 bunyan -perl -0777 -i.original -pe "s/entitlements\\['aps-environment'\\] =[^;]+;//gs" node_modules/\@expo/xdl/build/detach/IosNSBundle.js -perl -0777 -i.original -pe "s/entitlements\\['aps-environment'\\] =[^;]+;//gs" node_modules/turtle-cli/node_modules/\@expo/xdl/build/detach/IosNSBundle.js -node_modules/.bin/turtle build:ios \ +turtle build:ios \ -c ./app.json \ --team-id $APPLE_TEAM_ID \ --dist-p12-path $EXPO_P12_PATH \