diff --git a/.github/actions/androidapp-road-test/action.yml b/.github/actions/androidapp-road-test/action.yml index dc9cc8cff..562d50536 100644 --- a/.github/actions/androidapp-road-test/action.yml +++ b/.github/actions/androidapp-road-test/action.yml @@ -271,7 +271,7 @@ runs: if: steps.e2e.outputs.phase == 'full' || steps.e2e.outputs.phase == 'build' || steps.e2e.outputs.phase == 'test' run: | node <<'NODE' - const { getAndroidAppDetoxVariant } = require('./apps/brownfield-example-shared-tests/detox-androidapp-variants.cjs'); + const { getAndroidAppDetoxVariant } = require('./apps/shared-tests/detox-androidapp-variants.cjs'); const variant = getAndroidAppDetoxVariant(process.env.ANDROIDAPP_VARIANT); const append = (key, value) => { const fs = require('node:fs'); @@ -396,9 +396,9 @@ runs: # low on disk after Gradle/NDK builds (see ReactiveCircus/android-emulator-runner#455). script: | echo "==> Starting Detox tests at $(date -u +%H:%M:%S)" - bash apps/brownfield-example-shared-tests/scripts/prepare-android-emulator-for-detox.sh + bash apps/shared-tests/scripts/prepare-android-emulator-for-detox.sh cd apps/AndroidApp - bash apps/brownfield-example-shared-tests/scripts/run-with-android-logcat.sh apps/AndroidApp/e2e-artifacts/logcat-full.txt yarn "$ANDROIDAPP_E2E_TEST_SCRIPT" + bash ../shared-tests/scripts/run-with-android-logcat.sh e2e-artifacts/logcat-full.txt yarn "$ANDROIDAPP_E2E_TEST_SCRIPT" env: ANDROIDAPP_E2E_TEST_SCRIPT: ${{ env.ANDROIDAPP_E2E_TEST_SCRIPT }} diff --git a/.github/actions/appleapp-road-test/action.yml b/.github/actions/appleapp-road-test/action.yml index b9e579835..d37c74da5 100644 --- a/.github/actions/appleapp-road-test/action.yml +++ b/.github/actions/appleapp-road-test/action.yml @@ -182,7 +182,7 @@ runs: if: inputs.run-e2e == 'true' run: | node <<'NODE' - const { getAppleAppDetoxVariant } = require('./apps/brownfield-example-shared-tests/detox-appleapp-variants.cjs'); + const { getAppleAppDetoxVariant } = require('./apps/shared-tests/detox-appleapp-variants.cjs'); const variant = getAppleAppDetoxVariant(process.env.APPLEAPP_VARIANT); const append = (key, value) => { const fs = require('node:fs'); @@ -208,7 +208,7 @@ runs: uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5 with: path: apps/AppleApp/build - key: ${{ runner.os }}-e2e-appleapp-${{ inputs.variant }}-build-${{ hashFiles(format('{0}/ios/Podfile.lock', inputs.rn-project-path), 'apps/AppleApp/Brownfield Apple App.xcodeproj/project.pbxproj', 'apps/brownfield-example-shared-tests/e2e/**') }}-${{ hashFiles('apps/AppleApp/package/**/*.swiftinterface') }} + key: ${{ runner.os }}-e2e-appleapp-${{ inputs.variant }}-build-${{ hashFiles(format('{0}/ios/Podfile.lock', inputs.rn-project-path), 'apps/AppleApp/Brownfield Apple App.xcodeproj/project.pbxproj', 'apps/shared-tests/e2e/**') }}-${{ hashFiles('apps/AppleApp/package/**/*.swiftinterface') }} - name: Install Detox iOS artifacts if: inputs.run-e2e == 'true' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2773da4a1..40f322cc9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,19 +42,24 @@ jobs: - 'packages/**' rnapp: - 'apps/RNApp/**' - - 'apps/brownfield-example-shared-tests/**' + - 'apps/shared-tests/**' + - 'apps/shared-runtime/**' expo58: - 'apps/ExpoApp58/**' - - 'apps/brownfield-example-shared-tests/**' + - 'apps/shared-tests/**' + - 'apps/shared-runtime/**' expo57: - 'apps/ExpoApp57/**' - - 'apps/brownfield-example-shared-tests/**' + - 'apps/shared-tests/**' + - 'apps/shared-runtime/**' androidapp: - 'apps/AndroidApp/**' - - 'apps/brownfield-example-shared-tests/**' + - 'apps/shared-tests/**' + - 'apps/shared-runtime/**' appleapp: - 'apps/AppleApp/**' - - 'apps/brownfield-example-shared-tests/**' + - 'apps/shared-tests/**' + - 'apps/shared-runtime/**' gradle-plugins: - 'gradle-plugins/**' scripts: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index aaa719fc0..ca7630ce5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -147,7 +147,7 @@ Root scripts run from the repository root with `yarn