diff --git a/.github/workflows/e2e-v2.yml b/.github/workflows/e2e-v2.yml index 6bcbcf9b78..eb03cb8cc4 100644 --- a/.github/workflows/e2e-v2.yml +++ b/.github/workflows/e2e-v2.yml @@ -117,13 +117,13 @@ jobs: run: sudo apt-get update && sudo apt-get install -y ninja-build - uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5 - if: ${{ steps.platform-check.outputs.skip != 'true' }} + if: ${{ steps.platform-check.outputs.skip != 'true' && matrix.platform == 'android' }} with: java-version: "17" distribution: "adopt" - name: Gradle cache - if: ${{ steps.platform-check.outputs.skip != 'true' }} + if: ${{ steps.platform-check.outputs.skip != 'true' && matrix.platform == 'android' }} uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6 - name: Setup asdf Node.js (Bitrise) @@ -170,6 +170,8 @@ jobs: - name: Build SDK if: ${{ steps.platform-check.outputs.skip != 'true' }} run: yarn build + env: + PLATFORM: ${{ matrix.platform }} - uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5 if: ${{ steps.platform-check.outputs.skip != 'true' }} @@ -388,13 +390,13 @@ jobs: run: sudo apt-get update && sudo apt-get install -y ninja-build - uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5 - if: ${{ steps.platform-check.outputs.skip != 'true' }} + if: ${{ steps.platform-check.outputs.skip != 'true' && matrix.platform == 'android' }} with: java-version: "17" distribution: "adopt" - name: Gradle cache - if: ${{ steps.platform-check.outputs.skip != 'true' }} + if: ${{ steps.platform-check.outputs.skip != 'true' && matrix.platform == 'android' }} uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6 - name: Setup Global Tools @@ -561,13 +563,13 @@ jobs: run: sudo apt-get update && sudo apt-get install -y ninja-build - uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5 - if: ${{ steps.platform-check.outputs.skip != 'true' }} + if: ${{ steps.platform-check.outputs.skip != 'true' && matrix.platform == 'android' }} with: java-version: "17" distribution: "adopt" - name: Gradle cache - if: ${{ steps.platform-check.outputs.skip != 'true' }} + if: ${{ steps.platform-check.outputs.skip != 'true' && matrix.platform == 'android' }} uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6 - name: Setup KVM diff --git a/dev-packages/e2e-tests/cli.mjs b/dev-packages/e2e-tests/cli.mjs index 44b9dae1d2..c942c18c25 100755 --- a/dev-packages/e2e-tests/cli.mjs +++ b/dev-packages/e2e-tests/cli.mjs @@ -108,7 +108,7 @@ function patchBoostIfNeeded(rnVersion, patchScriptsDir) { // Build and publish the SDK - we only need to do this once in CI. // Locally, we may want to get updates from the latest build so do it on every app build. if (actions.includes('create') || (env.CI === undefined && actions.includes('build'))) { - execSync(`yarn build`, { stdio: 'inherit', cwd: workspaceRootDir, env: env }); + execSync(`yarn build`, { stdio: 'inherit', cwd: workspaceRootDir, env: { ...env, PLATFORM: platform } }); execSync(`yalc publish --private`, { stdio: 'inherit', cwd: e2eDir, env: env }); execSync(`yalc publish`, { stdio: 'inherit', cwd: expoUploadSourcemapsPackageDir, env: env }); execSync(`yalc publish`, { stdio: 'inherit', cwd: corePackageDir, env: env }); diff --git a/packages/core/package.json b/packages/core/package.json index b11fff5566..7eb32d8a8c 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -24,7 +24,7 @@ "build:tools": "tsc -p tsconfig.build.tools.json", "build:tools:watch": "tsc -p tsconfig.build.tools.json -w --preserveWatchOutput", "build:plugin": "EXPO_NONINTERACTIVE=true expo-module build plugin", - "build:replay-stubs": "cd android/replay-stubs && ./gradlew jar", + "build:replay-stubs": "[ \"$PLATFORM\" = \"ios\" ] && echo 'Skipping replay-stubs for iOS' && exit 0 || cd android/replay-stubs && ./gradlew jar", "build:tarball": "bash scripts/build-tarball.sh", "downlevel": "downlevel-dts dist ts3.8/dist --to=3.8", "clean": "rimraf dist coverage && yarn clean:plugin",