diff --git a/.github/actions/setup-woocommerce-monorepo/action.yml b/.github/actions/setup-woocommerce-monorepo/action.yml index 165b6930322..c6a7031c7af 100644 --- a/.github/actions/setup-woocommerce-monorepo/action.yml +++ b/.github/actions/setup-woocommerce-monorepo/action.yml @@ -22,14 +22,14 @@ inputs: runs: using: 'composite' steps: - - name: 'Read PNPM Version' - id: 'read-pnpm-version' - shell: 'bash' - run: 'echo "version=$(./.github/actions/setup-woocommerce-monorepo/scripts/read-pnpm-version.sh package.json)" >> $GITHUB_OUTPUT' - name: 'Setup PNPM' uses: 'pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d' - with: - version: ${{ steps.read-pnpm-version.outputs.version }} + # Next step is rudimentary - fixes a know composite action bug during post-actions: + # Error: Index was out of range. Must be non-negative and less than the size of the collection. + - name: 'Read PNPM version' + id: 'read-pnpm-version' + shell: 'bash' + run: 'echo "version=$(pnpm --version)" >> $GITHUB_OUTPUT' - name: 'Setup Node' uses: 'actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65' with: diff --git a/.github/actions/setup-woocommerce-monorepo/scripts/read-pnpm-version.sh b/.github/actions/setup-woocommerce-monorepo/scripts/read-pnpm-version.sh deleted file mode 100755 index 2acc7598b81..00000000000 --- a/.github/actions/setup-woocommerce-monorepo/scripts/read-pnpm-version.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -PACKAGE_FILE=$1 -if [[ -z "$PACKAGE_FILE" ]]; then - echo "Usage: $0 " - exit 1 -fi - -awk -F'"' '/"pnpm": ".+"/{ print $4; exit; }' $PACKAGE_FILE diff --git a/.github/workflows/pr-lint-markdown.yml b/.github/workflows/pr-lint-markdown.yml index 4a600aefd93..e996a23ee4e 100644 --- a/.github/workflows/pr-lint-markdown.yml +++ b/.github/workflows/pr-lint-markdown.yml @@ -38,7 +38,7 @@ jobs: docs/docs-manifest.json - name: Setup PNPM - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 + uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d - name: Setup Node uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c diff --git a/.github/workflows/release-code-freeze.yml b/.github/workflows/release-code-freeze.yml index 2605eb5cce4..633000a1801 100644 --- a/.github/workflows/release-code-freeze.yml +++ b/.github/workflows/release-code-freeze.yml @@ -31,7 +31,6 @@ jobs: issues: write pull-requests: write outputs: - pnpmVersion: ${{ steps.read-pnpm-version.outputs.version }} isTodayAcceleratedFreeze: ${{ steps.get-versions.outputs.isTodayAcceleratedFreeze }} isTodayMonthlyFreeze: ${{ steps.get-versions.outputs.isTodayMonthlyFreeze }} acceleratedVersion: ${{ steps.get-versions.outputs.acceleratedVersion }} @@ -47,18 +46,8 @@ jobs: with: fetch-depth: 0 - - name: Read PNPM Version - id: read-pnpm-version - shell: bash - run: | - version=$(./.github/actions/setup-woocommerce-monorepo/scripts/read-pnpm-version.sh package.json) - echo "version=$version" >> $GITHUB_OUTPUT - echo "PNPM Version: $version" - - name: Setup PNPM - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 - with: - version: ${{ steps.read-pnpm-version.outputs.version }} + uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d - name: Setup Node uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c @@ -149,9 +138,7 @@ jobs: fetch-depth: 0 - name: Setup PNPM - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 - with: - version: ${{ needs.code-freeze-prep.outputs.pnpmVersion }} + uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d - name: Setup Node uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c @@ -275,9 +262,7 @@ jobs: fetch-depth: 0 - name: Setup PNPM - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 - with: - version: ${{ needs.code-freeze-prep.outputs.pnpmVersion }} + uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d - name: Setup Node uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c @@ -346,9 +331,7 @@ jobs: fetch-depth: 0 - name: Setup PNPM - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 - with: - version: ${{ needs.code-freeze-prep.outputs.pnpmVersion }} + uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d - name: Setup Node uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c