From 304cc3091b00ba8cb14077e8b8f68bc5e65bdb8c Mon Sep 17 00:00:00 2001 From: Thomas Meckel <14177833+tmeckel@users.noreply.github.com> Date: Wed, 7 Jun 2023 09:49:23 +0200 Subject: [PATCH 1/2] fix: backout of pulumi/pulumi-package-publisher@v0.0.6 because the composite action is still in preview and not compatible right now with Pulummiverse --- .github/workflows/release.yml | 67 ++++++++++++++++++++++++++++++----- 1 file changed, 59 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 52af855..f5e3881 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,12 +3,6 @@ on: push: tags: - v*.*.* - -# New way of setting Github token permissions instead of a Personal Access Token -# Source: https://github.blog/changelog/2021-04-20-github-actions-control-permissions-for-github_token/ -permissions: - contents: write - env: # THIS GITHUB_TOKEN IS A REQUIREMENT TO BE ABLE TO WRITE TO GH RELEASES GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -32,11 +26,14 @@ env: # NEED TO CHANGE TO USE THE CORRECT PASSWORD PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} PYPI_USERNAME: "__token__" + PYPI_REPOSITORY_URL: "" PUBLISH_PYPI: true jobs: publish_binary: name: publish runs-on: ubuntu-latest + permissions: + contents: write steps: - name: Checkout Repo uses: actions/checkout@v3 @@ -67,8 +64,62 @@ jobs: runs-on: ubuntu-latest needs: publish_binary steps: - - name: Publish SDKs - uses: pulumi/pulumi-package-publisher@v0.0.6 + - name: Checkout Repo + uses: actions/checkout@v2 + - name: Unshallow clone for tags + run: git fetch --prune --unshallow --tags + - name: Install Go + uses: actions/setup-go@v2 + with: + go-version: ${{ matrix.goversion }} + - name: Install pulumictl + uses: jaxxstorm/action-install-gh-release@v1.5.0 + with: + repo: pulumi/pulumictl + - name: Install Pulumi CLI + uses: pulumi/action-install-pulumi-cli@v2.0.0 + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: ${{matrix.nodeversion}} + registry-url: ${{env.NPM_REGISTRY_URL}} + - name: Setup DotNet + uses: actions/setup-dotnet@v1 + with: + dotnet-version: ${{matrix.dotnetverson}} + - name: Setup Python + uses: actions/setup-python@v1 + with: + python-version: ${{matrix.pythonversion}} + - name: Build SDK + run: make build_${{ matrix.language }} + - name: Check worktree clean + run: | + git update-index -q --refresh + if ! git diff-files --quiet; then + >&2 echo "error: working tree is not clean, aborting!" + git status + git diff + exit 1 + fi + - if: ${{ matrix.language == 'python' && env.PUBLISH_PYPI == 'true' }} + name: Publish package to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 + with: + user: ${{ env.PYPI_USERNAME }} + password: ${{ env.PYPI_PASSWORD }} + packages_dir: ${{github.workspace}}/sdk/python/bin/dist + - if: ${{ matrix.language == 'nodejs' && env.PUBLISH_NPM == 'true' }} + uses: JS-DevTools/npm-publish@v1 + with: + access: "public" + token: ${{ env.NPM_TOKEN }} + package: ${{github.workspace}}/sdk/nodejs/bin/package.json + - if: ${{ matrix.language == 'dotnet' && env.PUBLISH_NUGET == 'true' }} + name: publish nuget package + run: | + dotnet nuget push ${{github.workspace}}/sdk/dotnet/bin/Debug/*.nupkg -s ${{ env.NUGET_FEED_URL }} -k ${{ env.NUGET_PUBLISH_KEY }} + echo "done publishing packages" strategy: fail-fast: true matrix: From fb7eb0dc7441670b743ead811293a877a75514a8 Mon Sep 17 00:00:00 2001 From: Thomas Meckel <14177833+tmeckel@users.noreply.github.com> Date: Wed, 7 Jun 2023 10:26:50 +0200 Subject: [PATCH 2/2] fix: corrected reference to dotnetversion in matrix build publish_sdk --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f5e3881..7486f4d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -86,7 +86,7 @@ jobs: - name: Setup DotNet uses: actions/setup-dotnet@v1 with: - dotnet-version: ${{matrix.dotnetverson}} + dotnet-version: ${{matrix.dotnetversion}} - name: Setup Python uses: actions/setup-python@v1 with: