Merge 2024 10 21 (#70)

Fix artifact save behavior on windows (make archives that can be extracted on linux) Drop '-internal' references from node-go-simple.
milaboratory · Oct 21, 2024 · 025c8b2 · 025c8b2
1 parent 55ff8d4
commit 025c8b2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 32 deletions.
diff --git a/.github/workflows/node-go-simple.yaml b/.github/workflows/node-go-simple.yaml
@@ -396,7 +396,7 @@ jobs:
         with:
           github-token: ${{ env.GH_CI_PAT || secrets.GITHUB_TOKEN }}
 
-      - uses: milaboratory/github-ci-internal/blocks/node/build/generic@v4
+      - uses: milaboratory/github-ci/blocks/node/build/generic@v4
         with:
           build-script-name: ${{ inputs.build-script-name }}
           node-version: ${{ inputs.node-version }}
@@ -464,16 +464,6 @@ jobs:
         with:
           submodules: ${{ inputs.checkout-submodules }}
 
-      - id: npm-pkg-metadata
-        uses: milaboratory/github-ci/actions/shell@v4
-        with:
-          run: |
-            NPM_PKG_NAME="$(cat "${GITHUB_WORKSPACE}/package.json" | jq --raw-output '.name')"
-            NPM_PKG_VERSION="$(cat "${GITHUB_WORKSPACE}/package.json" | jq --raw-output '.version')"
-
-            ghwa_set_output npm-pkg-name "${NPM_PKG_NAME}"
-            ghwa_set_output npm-pkg-version "${NPM_PKG_VERSION}"
-
       - name: Prepare environment for running Golang
         uses: milaboratory/github-ci/actions/golang/prepare@v4
         with:
@@ -486,7 +476,7 @@ jobs:
         with:
           github-token: ${{ env.GH_CI_PAT || secrets.GITHUB_TOKEN }}
 
-      - uses: milaboratory/github-ci-internal/blocks/node/test@v4
+      - uses: milaboratory/github-ci/blocks/node/test@v4
         with:
           test-name: ${{ inputs.test-script-name }}
           node-version: ${{ inputs.node-version }}
@@ -500,7 +490,7 @@ jobs:
     outputs:
       # Even constant outputs become initialized only after job start.
       # All outputs of skipped jobs are always empty.
-      npm-pkg-version: ${{ fromJSON(steps.npm-pkg-metadata.outputs.data).npm-pkg-version }}
+      npm-pkg-version: ${{ needs.build.outputs.npm-pkg-version }}
       started: 'true'
 
   notify-test:
@@ -623,21 +613,10 @@ jobs:
         with:
           submodules: ${{ inputs.checkout-submodules }}
 
-      - id: npm-pkg-metadata
-        uses: milaboratory/github-ci/actions/shell@v4
-        with:
-          run: |
-            NPM_PKG_NAME="$(cat "${GITHUB_WORKSPACE}/package.json" | jq --raw-output '.name')"
-            NPM_PKG_VERSION="$(cat "${GITHUB_WORKSPACE}/package.json" | jq --raw-output '.version')"
-
-            ghwa_set_output npm-pkg-name "${NPM_PKG_NAME}"
-            ghwa_set_output npm-pkg-version "${NPM_PKG_VERSION}"
-
       - id: npm-pkg-status
         uses: milaboratory/github-ci/actions/node/npm-pkg-status@v4
         with:
-          npm-pkg-name: ${{ fromJSON(steps.npm-pkg-metadata.outputs.data).npm-pkg-name }}
-          npm-pkg-version: ${{ fromJSON(steps.npm-pkg-metadata.outputs.data).npm-pkg-version }}
+          package-json-path: "${{ github.workspace }}/package.json"
           registry-url: ${{ inputs.registry-url }}
           npm-auth-token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -655,9 +634,9 @@ jobs:
         if: steps.npm-pkg-status.outputs.exist == '0'
           && steps.context.outputs.is-release == 'true'
         with:
-          github-token: ${{ senv.GH_CI_PAT || secrets.GITHUB_TOKEN }}
+          github-token: ${{ env.GH_CI_PAT || secrets.GITHUB_TOKEN }}
 
-      - uses: milaboratory/github-ci-internal/blocks/node/build/generic@v4
+      - uses: milaboratory/github-ci/blocks/node/build/generic@v4
         if: steps.npm-pkg-status.outputs.exist == '0'
           && steps.context.outputs.is-release == 'true'
         with:
@@ -727,7 +706,7 @@ jobs:
           && steps.context.outputs.is-release == 'true'
         uses: milaboratory/github-ci/actions/release/create-with-tag@v4
         env:
-          NPM_PKG_VERSION: ${{ fromJSON(steps.npm-pkg-metadata.outputs.data).npm-pkg-version }}
+          NPM_PKG_VERSION: ${{ steps.npm-pkg-status.outputs.pkg-version }}
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ format('v{0}', env.NPM_PKG_VERSION) }}
@@ -739,7 +718,7 @@ jobs:
     outputs:
       # Even constant outputs become initialized only after job start.
       # All outputs of skipped jobs are always empty.
-      npm-pkg-version: ${{ fromJSON(steps.npm-pkg-metadata.outputs.data).npm-pkg-version }}
+      npm-pkg-version: ${{ steps.npm-pkg-status.outputs.pkg-version }}
       started: 'true'
 
   notify-release:
@@ -768,7 +747,7 @@ jobs:
           telegram-token: ${{ secrets.TELEGRAM_API_TOKEN }}
 
           job-status: |
-            ${{ needs.create-release.result }}
+            ${{ needs.release.result }}
             ${{ needs.publish-to-npm.result }}
 
           product-name: ${{ inputs.app-name }}

diff --git a/actions/artifact/save/action.yaml b/actions/artifact/save/action.yaml
@@ -116,7 +116,7 @@ runs:
         fi
 
         if [ "${RUNNER_OS}" == "Windows" ]; then
-          ARTIFACT_PATHS="${ARTIFACT_PATHS//\\/\\\\}" # escape windows delimiters to not confuse tar
+          ARTIFACT_PATHS="${ARTIFACT_PATHS//\\//}" # convert windows delimiters to not confuse tar
         fi
 
         echo "${ARTIFACT_PATHS}" > "${ARCHIVE_NAME}.files"

diff --git a/actions/node/npm-pkg-status/action.yaml b/actions/node/npm-pkg-status/action.yaml
@@ -54,7 +54,6 @@ runs:
 
   steps:
     - name: Read package name and version
-      if: inputs.package-json-path != '0'
       uses: milaboratory/github-ci/actions/shell@v4
       id: package
       env: