diff --git a/.github/actions/build-android/action.yml b/.github/actions/build-android/action.yml index cf2367f647e..b18e605c8eb 100644 --- a/.github/actions/build-android/action.yml +++ b/.github/actions/build-android/action.yml @@ -16,7 +16,7 @@ runs: - name: Setup node.js uses: ./.github/actions/setup-node - name: Install node dependencies - uses: ./.github/actions/yarn-install-with-cache + uses: ./.github/actions/yarn-install - name: Set React Native Version shell: bash run: node ./scripts/releases/set-rn-artifacts-version.js --build-type ${{ inputs.release-type }} diff --git a/.github/actions/build-hermes-macos/action.yml b/.github/actions/build-hermes-macos/action.yml index 18afd8b98b0..41c7e6e869c 100644 --- a/.github/actions/build-hermes-macos/action.yml +++ b/.github/actions/build-hermes-macos/action.yml @@ -47,7 +47,7 @@ runs: fi - name: Yarn- Install Dependencies if: ${{ steps.check_if_apple_artifacts_are_there.outputs.ARTIFACTS_EXIST != 'true' }} - uses: ./.github/actions/yarn-install-with-cache + uses: ./.github/actions/yarn-install - name: Slice cache macosx if: ${{ steps.check_if_apple_artifacts_are_there.outputs.ARTIFACTS_EXIST != 'true' }} uses: actions/download-artifact@v4 diff --git a/.github/actions/build-npm-package/action.yml b/.github/actions/build-npm-package/action.yml index 295868a376b..2f66293313b 100644 --- a/.github/actions/build-npm-package/action.yml +++ b/.github/actions/build-npm-package/action.yml @@ -103,7 +103,7 @@ runs: - name: Setup gradle uses: ./.github/actions/setup-gradle - name: Install dependencies - uses: ./.github/actions/yarn-install-with-cache + uses: ./.github/actions/yarn-install - name: Build packages shell: bash run: yarn build diff --git a/.github/actions/create-release/action.yml b/.github/actions/create-release/action.yml index 0d0f2055f03..ff22a0cb3a0 100644 --- a/.github/actions/create-release/action.yml +++ b/.github/actions/create-release/action.yml @@ -15,7 +15,7 @@ runs: using: composite steps: - name: Yarn install - uses: ./.github/actions/yarn-install-with-cache + uses: ./.github/actions/yarn-install - name: Configure Git shell: bash run: | diff --git a/.github/actions/prepare-hermes-workspace/action.yml b/.github/actions/prepare-hermes-workspace/action.yml index 4a5e638790e..22dbe356ee5 100644 --- a/.github/actions/prepare-hermes-workspace/action.yml +++ b/.github/actions/prepare-hermes-workspace/action.yml @@ -69,7 +69,7 @@ runs: - name: Yarn- Install Dependencies if: ${{ steps.meaningful-cache.outputs.HERMES_CACHED != 'true' }} - uses: ./.github/actions/yarn-install-with-cache + uses: ./.github/actions/yarn-install - name: Download Hermes tarball if: ${{ steps.meaningful-cache.outputs.HERMES_CACHED != 'true' }} diff --git a/.github/actions/setup-node/action.yml b/.github/actions/setup-node/action.yml index fe041bca1c6..b1d1a1ebf96 100644 --- a/.github/actions/setup-node/action.yml +++ b/.github/actions/setup-node/action.yml @@ -12,3 +12,4 @@ runs: uses: actions/setup-node@v4 with: node-version: ${{ inputs.node-version }} + cache: yarn diff --git a/.github/actions/test-ios-helloworld/action.yml b/.github/actions/test-ios-helloworld/action.yml index c3819ae9527..687a9d24970 100644 --- a/.github/actions/test-ios-helloworld/action.yml +++ b/.github/actions/test-ios-helloworld/action.yml @@ -41,7 +41,7 @@ runs: shell: bash run: ls -lR "$HERMES_WS_DIR" - name: Run yarn - uses: ./.github/actions/yarn-install-with-cache + uses: ./.github/actions/yarn-install - name: Setup ruby uses: ruby/setup-ruby@v1.170.0 with: diff --git a/.github/actions/test-ios-rntester/action.yml b/.github/actions/test-ios-rntester/action.yml index 25acfe2cd60..d731957978b 100644 --- a/.github/actions/test-ios-rntester/action.yml +++ b/.github/actions/test-ios-rntester/action.yml @@ -41,7 +41,7 @@ runs: - name: Setup node.js uses: ./.github/actions/setup-node - name: Run yarn - uses: ./.github/actions/yarn-install-with-cache + uses: ./.github/actions/yarn-install - name: Download Hermes uses: actions/download-artifact@v4 with: diff --git a/.github/actions/test-js/action.yml b/.github/actions/test-js/action.yml index 4cb531c4609..58ee569fc6f 100644 --- a/.github/actions/test-js/action.yml +++ b/.github/actions/test-js/action.yml @@ -13,7 +13,7 @@ runs: with: node-version: ${{ inputs.node-version }} - name: Yarn install - uses: ./.github/actions/yarn-install-with-cache + uses: ./.github/actions/yarn-install - name: Run Tests - JavaScript Tests shell: bash run: node ./scripts/run-ci-javascript-tests.js --maxWorkers 2 diff --git a/.github/actions/yarn-install-with-cache/action.yml b/.github/actions/yarn-install-with-cache/action.yml deleted file mode 100644 index 8273398acbb..00000000000 --- a/.github/actions/yarn-install-with-cache/action.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: yarn-install-with-cache -inputs: - update-cache: - description: Update the cache, only do this if you are update-node-modules-cache.yml - default: "false" -description: Only update node_modules if on main -runs: - using: composite - steps: - - name: Load node_modules from cache - # Restore for all branches, but save for 'main'. - uses: actions/cache/restore@v4 - with: - path: node_modules/ - key: node-modules-${{ hashFiles('package.json') }} - - name: Install dependencies - shell: bash - run: yarn install --non-interactive - - name: Save node_modules to the cache - if: github.ref == 'refs/heads/main' && inputs.update-cache == 'true' - uses: actions/cache/save@v4 - with: - path: node_modules/ - # We're assuming that variations on branches will slightly vary from main, - # so it's always important to run yarn install --non-interactive after this - # cache is restored. - key: node-modules-v1-${{ hashFiles('package.json') }} - enableCrossOsArchive: true diff --git a/.github/actions/yarn-install/action.yml b/.github/actions/yarn-install/action.yml new file mode 100644 index 00000000000..16a63579205 --- /dev/null +++ b/.github/actions/yarn-install/action.yml @@ -0,0 +1,7 @@ +name: yarn-install +runs: + using: composite + steps: + - name: Install dependencies + shell: bash + run: yarn install --non-interactive --frozen-lockfile diff --git a/.github/workflows/publish-bumped-packages.yml b/.github/workflows/publish-bumped-packages.yml index 6d5c27fbdd6..d2a2fb7a9b3 100644 --- a/.github/workflows/publish-bumped-packages.yml +++ b/.github/workflows/publish-bumped-packages.yml @@ -17,7 +17,7 @@ jobs: - name: Setup node.js uses: ./.github/actions/setup-node - name: Run Yarn Install - uses: ./.github/actions/yarn-install-with-cache + uses: ./.github/actions/yarn-install - name: Build packages run: yarn build - name: Set NPM auth token diff --git a/.github/workflows/test-all.yml b/.github/workflows/test-all.yml index b10d34c2323..317fdbc49f4 100644 --- a/.github/workflows/test-all.yml +++ b/.github/workflows/test-all.yml @@ -242,7 +242,7 @@ jobs: - name: Setup node.js uses: ./.github/actions/setup-node - name: Run yarn - uses: ./.github/actions/yarn-install-with-cache + uses: ./.github/actions/yarn-install - name: Setup ruby uses: ruby/setup-ruby@v1.170.0 with: @@ -320,7 +320,7 @@ jobs: - name: Setup node.js uses: ./.github/actions/setup-node - name: Run yarn - uses: ./.github/actions/yarn-install-with-cache + uses: ./.github/actions/yarn-install - name: Set up JDK 17 uses: actions/setup-java@v2 with: @@ -451,7 +451,7 @@ jobs: - name: Setup node.js uses: ./.github/actions/setup-node - name: Install node dependencies - uses: ./.github/actions/yarn-install-with-cache + uses: ./.github/actions/yarn-install - name: Download APK uses: actions/download-artifact@v4 with: @@ -533,7 +533,7 @@ jobs: - name: Setup gradle uses: ./.github/actions/setup-gradle - name: Run yarn install - uses: ./.github/actions/yarn-install-with-cache + uses: ./.github/actions/yarn-install - name: Prepare the Helloworld application shell: bash run: node ./scripts/e2e/init-project-e2e.js --useHelloWorld --pathToLocalReactNative "$GITHUB_WORKSPACE/build/$(cat build/react-native-package-version)" diff --git a/.github/workflows/update-node-modules-cache.yml b/.github/workflows/update-node-modules-cache.yml deleted file mode 100644 index 9c74021341b..00000000000 --- a/.github/workflows/update-node-modules-cache.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Update node modules cache - -on: - workflow_dispatch: - push: - branches: - - main - -jobs: - update_node_modules_cache: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Install yarn dependencies and update cache - uses: ./.github/actions/yarn-install-with-cache - with: - update-cache: "true"