Merge to v4 2024 11 04 1 (#72)

merge v4-beta to v4
milaboratory · Nov 4, 2024 · 9e305f5 · 9e305f5
1 parent 5d270c5
commit 9e305f5
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 31 deletions.
diff --git a/.github/workflows/node-simple-pnpm.yaml b/.github/workflows/node-simple-pnpm.yaml
@@ -368,7 +368,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: ${{ inputs.checkout-submodules }}
-          fetch-depth: '0'          
+          fetch-depth: '0'
 
       - name: Prepare environment for building a NodeJS application
         uses: milaboratory/github-ci/actions/node/prepare-pnpm@v4
@@ -446,7 +446,53 @@ jobs:
           storage-provider: 's3'
           storage-path: ${{ env.AWS_CI_TURBOREPO_S3_BUCKET }}
 
-      - uses: milaboratory/github-ci/blocks/node/build-and-test-pnpm@v4
+      - name: Prepare environment for building a NodeJS application
+        uses: milaboratory/github-ci/actions/node/prepare-pnpm@v4
+        env:
+          PNPM_VERSION: ${{ needs.metadata.outputs.pnpm-version }}
+        with:
+          node-version: ${{ inputs.node-version }}
+          cache-version: ${{ inputs.cache-version }}
+          pnpm-version: ${{ env.PNPM_VERSION || inputs.pnpm-version }}
+          cache-hashfiles-search-path: ${{ inputs.cache-hashfiles-search-path }}
+          npmrc-config: ${{ inputs.npmrc-config }}
+
+      - name: Install NodeJS packages with pnpm
+        uses: milaboratory/github-ci/actions/shell@v4
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPMJS_TOKEN: ${{ env.NPMJS_TOKEN  }}
+        with:
+          dump-stdout: false
+          run: |
+            pnpm install --frozen-lockfile --prefer-offline
+
+      - name: Run changeset version
+        if: ( github.event_name == 'push' && github.ref_name == 'main') || github.event_name == 'pull_request'
+        uses: milaboratory/github-ci/actions/shell@v4
+        with:
+          run: |
+            pnpm run version-packages
+
+      - name: Get changed files
+        if: github.event_name == 'push'
+          && github.ref_name == 'main'
+        id: changed-files
+        uses: milaboratory/github-ci/actions/git/verify-changed-files@v4
+        with:
+          files: ${{ inputs.changed-files-list }}
+          match-gitignore-files: ${{ inputs.match-gitignore-files }}
+
+      - name: List all changed files
+        env:
+          ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.changed_files }}
+        run: |
+          for file in ${ALL_CHANGED_FILES}; do
+            echo "$file was changed"
+          done
+
+      - name: Run build
+        uses: milaboratory/github-ci/blocks/node/build-and-test-pnpm@v4
         env:
           NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPMJS_TOKEN: ${{ env.NPMJS_TOKEN  }}
@@ -465,7 +511,8 @@ jobs:
           pnpm-version: ${{ env.PNPM_VERSION || inputs.pnpm-version }}
           npmrc-config: ${{ inputs.npmrc-config }}
 
-      - id: test
+      - name: Run tests
+        id: test
         uses: milaboratory/github-ci/blocks/pl/linux/test-pl-docker-pnpm@v4
         if: inputs.test
         env:
@@ -493,31 +540,6 @@ jobs:
           pl-log-commit-summary: ${{ inputs.pl-log-commit-summary }}
           pl-log-resource-data: ${{ inputs.pl-log-resource-data }}
 
-      - name: Run changeset version
-        if: github.event_name == 'push'
-          && github.ref_name == 'main'
-        uses: milaboratory/github-ci/actions/shell@v4
-        with:
-          run: |
-            pnpm run version-packages
-
-      - name: Get changed files
-        if: github.event_name == 'push'
-          && github.ref_name == 'main'
-        id: changed-files
-        uses: milaboratory/github-ci/actions/git/verify-changed-files@v4
-        with:
-          files: ${{ inputs.changed-files-list }}
-          match-gitignore-files: ${{ inputs.match-gitignore-files }}
-
-      - name: List all changed files
-        env:
-          ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.changed_files }}
-        run: |
-          for file in ${ALL_CHANGED_FILES}; do
-            echo "$file was changed"
-          done
-
       - name: Get GitHub App User ID
         if: steps.changed-files.outputs.files_changed == 'true'
         id: get-user-id

diff --git a/blocks/signing-tools/macos-notarize/action.yaml b/blocks/signing-tools/macos-notarize/action.yaml
@@ -69,13 +69,13 @@ runs:
 
             status=$(jq -r .status </tmp/notarization_info.json)
             id=$(jq -r .id </tmp/notarization_info.json)
-            
+
             if [ -z "${id}" ]; then
               echo "Unexpected notarization tool response: empty notarization task ID"
               cat /tmp/notarization_info.json
               exit 1
             fi
-            
+
             echo "status=${status} id=${id}"
 
             xcrun notarytool log \

diff --git a/blocks/update-cdn-link/action.yaml b/blocks/update-cdn-link/action.yaml
@@ -75,4 +75,5 @@ runs:
           aws s3api put-object \
             --bucket "${S3_BUCKET}" \
             --key "${S3_KEY}" \
-            --website-redirect-location "${REDIRECT_LINK}"
+            --website-redirect-location "${REDIRECT_LINK}"
+