diff --git a/.github/workflows/covector-version-or-publish-v1.yml b/.github/workflows/covector-version-or-publish-v1.yml index 4be13c600..0b004e36c 100644 --- a/.github/workflows/covector-version-or-publish-v1.yml +++ b/.github/workflows/covector-version-or-publish-v1.yml @@ -116,15 +116,17 @@ jobs: event-type: update-docs - name: Get `@tauri-apps/cli` release id + uses: actions/github-script@v6 id: cliReleaseId if: | steps.covector.outputs.successfulPublish == 'true' && contains(steps.covector.outputs.packagesPublished, '@tauri-apps/cli') - run: | - echo '${{ steps.covector.outputs }}' > output.json - id=$(jq '.["-tauri-apps-cli-releaseId"]' < output.json) - rm output.json - echo "cliReleaseId=$id" >> "$GITHUB_OUTPUT" + with: + result-encoding: string + script: | + const output = `${{ toJSON(steps.covector.outputs) }}`; + const [_, id] = /"-tauri-apps-cli-releaseId": "([0-9]+)"/g.exec(output); + return id; - name: Trigger `@tauri-apps/cli` publishing workflow if: | @@ -135,7 +137,7 @@ jobs: token: ${{ secrets.ORG_TAURI_BOT_PAT }} repository: tauri-apps/tauri event-type: publish-js-cli - client-payload: '{"releaseId": "${{ steps.cliReleaseId.outputs.cliReleaseId }}" }' + client-payload: '{"releaseId": "${{ steps.cliReleaseId.outputs.result }}" }' - name: Trigger `tauri-cli` publishing workflow if: | diff --git a/.github/workflows/covector-version-or-publish.yml b/.github/workflows/covector-version-or-publish.yml index e4a91586a..895e2d48a 100644 --- a/.github/workflows/covector-version-or-publish.yml +++ b/.github/workflows/covector-version-or-publish.yml @@ -115,14 +115,18 @@ jobs: repository: tauri-apps/tauri-docs event-type: update-docs - - name: Process covector output - id: covectorOutput + - name: Get `@tauri-apps/cli` release id + uses: actions/github-script@v6 + id: cliReleaseId if: | steps.covector.outputs.successfulPublish == 'true' && contains(steps.covector.outputs.packagesPublished, '@tauri-apps/cli') - run: | - id=$(node .scripts/covector/parse-output.js '${{ toJSON(steps.covector.outputs) }}' "-tauri-apps-cli-releaseId") - echo "cliReleaseId=$id" >> "$GITHUB_OUTPUT" + with: + result-encoding: string + script: | + const output = `${{ toJSON(steps.covector.outputs) }}`; + const [_, id] = /"-tauri-apps-cli-releaseId": "([0-9]+)"/g.exec(output); + return id; - name: Trigger `@tauri-apps/cli` publishing workflow if: | @@ -133,7 +137,7 @@ jobs: token: ${{ secrets.ORG_TAURI_BOT_PAT }} repository: tauri-apps/tauri event-type: publish-js-cli - client-payload: '{"releaseId": "${{ steps.covectorOutput.outputs.cliReleaseId }}" }' + client-payload: '{"releaseId": "${{ steps.cliReleaseId.outputs.result }}" }' - name: Trigger `tauri-cli` publishing workflow if: | diff --git a/.scripts/covector/parse-output.js b/.scripts/covector/parse-output.js deleted file mode 100644 index 4c1747de6..000000000 --- a/.scripts/covector/parse-output.js +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env node - -// Copyright 2019-2023 Tauri Programme within The Commons Conservancy -// SPDX-License-Identifier: Apache-2.0 -// SPDX-License-Identifier: MIT - -const json = process.argv[2] -const field = process.argv[3] - -const output = JSON.parse(json) -console.log(output[field])