diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index 3afc7eff..7752ecf9 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -25,6 +25,7 @@ jobs: needs: lint runs-on: bitrise-react-native-code-push-linux-runner strategy: + fail-fast: false matrix: variant: [bare, expo] include: @@ -64,6 +65,7 @@ jobs: needs: lint runs-on: bitrise-react-native-code-push-macos-runner strategy: + fail-fast: false matrix: variant: [bare, expo] include: diff --git a/code-push-plugin-testing-framework/script/testBuilder.js b/code-push-plugin-testing-framework/script/testBuilder.js index 34a20295..b57ad908 100644 --- a/code-push-plugin-testing-framework/script/testBuilder.js +++ b/code-push-plugin-testing-framework/script/testBuilder.js @@ -62,9 +62,9 @@ function getDescribe() { } function itInternal(func, expectation, isCoreTest, assertion) { if ((!TestConfig.onlyRunCoreTests || isCoreTest)) { - // Create a wrapper around the assertion to set the timeout on the test to 10 minutes. + // DIAGNOSTIC: temporarily shortened from 20 minutes to get faster CI feedback while debugging PR #13's iOS Expo test hang. Revert before merging. var assertionWithTimeout = function (done) { - this.timeout(10 * 2 * 60 * 1000); + this.timeout(6 * 60 * 1000); assertion(done); }; return it(expectation, assertionWithTimeout); diff --git a/test/template/app.json b/test/template/app.json index 67fe977a..faf5779d 100644 --- a/test/template/app.json +++ b/test/template/app.json @@ -26,14 +26,6 @@ "CodePushServerURL": "http://10.0.2.2:3001" } } - ], - [ - "expo-build-properties", - { - "ios": { - "deploymentTarget": "15.5" - } - } ] ] } diff --git a/test/test.ts b/test/test.ts index 1fd3862d..ff18c541 100644 --- a/test/test.ts +++ b/test/test.ts @@ -366,12 +366,11 @@ class RNProjectManager extends ProjectManager { mkdirp.sync(projectDirectory); if (TestConfig.isExpoApp) { - return TestUtil.getProcessOutput(`npx create-expo-app@latest ${appName} --template blank@sdk-55`, { cwd: projectDirectory, timeout: 30 * 60 * 1000 }) + return TestUtil.getProcessOutput(`npx create-expo-app@latest ${appName} --template blank@sdk-57`, { cwd: projectDirectory, timeout: 30 * 60 * 1000 }) .then((e) => { console.log(`"npx expo init ${appName}" success. cwd=${projectDirectory}`); return e; }) .then(this.copyTemplate.bind(this, templatePath, projectDirectory)) .then(TestUtil.getProcessOutput.bind(undefined, TestConfig.thisPluginInstallString, { cwd: path.join(projectDirectory, TestConfig.TestAppName) })) .then(installExpoBundleTooling.bind(undefined, path.join(projectDirectory, TestConfig.TestAppName))) - .then(TestUtil.getProcessOutput.bind(undefined, "npx expo install expo-build-properties", { cwd: path.join(projectDirectory, TestConfig.TestAppName) })) .then(TestUtil.getProcessOutput.bind(undefined, `npx expo prebuild --clean`, { cwd: path.join(projectDirectory, TestConfig.TestAppName) })) .then(() => { ensureAndroidCleartextTraffic(path.join(projectDirectory, TestConfig.TestAppName, "android", "app", "src", "main", "AndroidManifest.xml"));