diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9e9832842..ac8702702 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,9 +8,6 @@ on: concurrency: ${{ github.workflow }}-${{ github.ref }} env: - VSCE_PAT: ${{ secrets.VSCE_PAT }} - OVSX_PAT: ${{ secrets.OPENVSX_TOKEN }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} npm_config_registry: "https://registry.npmjs.org" jobs: @@ -26,6 +23,7 @@ jobs: with: submodules: true fetch-depth: 0 + persist-credentials: false - name: Setup pnpm uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 # v6.0.10 @@ -81,10 +79,17 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_CONFIG_PROVENANCE: true + - name: Clear GitHub credentials before marketplace publish + run: rm -f "$HOME/.netrc" + - name: VS Code Marketplace publish if: steps.changesets.outputs.hasChangesets == 'false' && steps.marketplace-version.outputs.version != steps.package-version.outputs.version run: pnpm publish:vsce + env: + VSCE_PAT: ${{ secrets.VSCE_PAT }} - name: Open VSX Registry publish if: steps.changesets.outputs.hasChangesets == 'false' && steps.marketplace-version.outputs.version != steps.package-version.outputs.version run: pnpm publish:ovsx + env: + OVSX_PAT: ${{ secrets.OPENVSX_TOKEN }} diff --git a/.github/workflows/vscode-release.yml b/.github/workflows/vscode-release.yml index 4ed08310a..5ae42353c 100644 --- a/.github/workflows/vscode-release.yml +++ b/.github/workflows/vscode-release.yml @@ -3,12 +3,11 @@ name: VS Code Release Workflow in a pinch on: workflow_dispatch env: - VSCE_PAT: ${{ secrets.VSCE_PAT }} - OVSX_PAT: ${{ secrets.OPENVSX_TOKEN }} - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} npm_config_registry: "https://registry.npmjs.org" +permissions: + contents: read + jobs: publish-packages: runs-on: ubuntu-latest @@ -17,6 +16,7 @@ jobs: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: submodules: true + persist-credentials: false - name: Setup pnpm uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 # v6.0.10 @@ -40,6 +40,10 @@ jobs: - name: VS Code Marketplace publish run: pnpm publish:vsce + env: + VSCE_PAT: ${{ secrets.VSCE_PAT }} - name: Open VSX Registry publish run: pnpm publish:ovsx + env: + OVSX_PAT: ${{ secrets.OPENVSX_TOKEN }}