From 9adb5d9fa0c375d16cbc8f13f6572625d59f3f4d Mon Sep 17 00:00:00 2001 From: Pulumi Bot <30351955+pulumi-bot@users.noreply.github.com> Date: Wed, 8 May 2024 06:18:37 -0700 Subject: [PATCH] [internal] Update GitHub Actions workflow files (#103) --- .github/workflows/check-upstream-upgrade.yml | 3 - .github/workflows/command-dispatch.yml | 2 +- .github/workflows/license.yml | 4 +- .github/workflows/lint.yml | 8 +- .github/workflows/master.yml | 117 +++++++++++-------- .github/workflows/prerelease.yml | 108 +++++++++++------ .github/workflows/pull-request.yml | 2 +- .github/workflows/release.yml | 116 +++++++++++------- .github/workflows/resync-build.yml | 4 +- .github/workflows/run-acceptance-tests.yml | 94 +++++++++------ Makefile | 48 +++++--- devbox.json | 2 +- scripts/upstream.sh | 2 +- 13 files changed, 315 insertions(+), 195 deletions(-) diff --git a/.github/workflows/check-upstream-upgrade.yml b/.github/workflows/check-upstream-upgrade.yml index fc483816..352bc4d9 100644 --- a/.github/workflows/check-upstream-upgrade.yml +++ b/.github/workflows/check-upstream-upgrade.yml @@ -16,9 +16,6 @@ jobs: go-version: 1.21.x - name: Checkout Repo uses: actions/checkout@v4 - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags - shell: bash - name: Install upgrade-provider run: go install github.com/pulumi/upgrade-provider@main shell: bash diff --git a/.github/workflows/command-dispatch.yml b/.github/workflows/command-dispatch.yml index 47a86c0b..6dcee1be 100644 --- a/.github/workflows/command-dispatch.yml +++ b/.github/workflows/command-dispatch.yml @@ -22,7 +22,7 @@ env: PULUMI_MISSING_DOCS_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} PYPI_USERNAME: __token__ - PYTHONVERSION: "3.11" + PYTHONVERSION: 3.11.8 SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }} SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }} SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }} diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index e48efec3..2ffae6f9 100644 --- a/.github/workflows/license.yml +++ b/.github/workflows/license.yml @@ -28,7 +28,7 @@ env: PULUMI_MISSING_DOCS_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} PYPI_USERNAME: __token__ - PYTHONVERSION: "3.11" + PYTHONVERSION: 3.11.8 SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }} SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }} SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }} @@ -46,8 +46,6 @@ jobs: uses: actions/checkout@v4 with: ref: ${{ env.PR_COMMIT_SHA }} - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags - name: Install Go uses: actions/setup-go@v5 with: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index b8e92005..c9d3dbf4 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -27,7 +27,7 @@ env: PULUMI_MISSING_DOCS_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} PYPI_USERNAME: __token__ - PYTHONVERSION: "3.11" + PYTHONVERSION: 3.11.8 SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }} SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }} SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }} @@ -47,7 +47,7 @@ jobs: uses: actions/setup-go@v5 with: # The versions of golangci-lint and setup-go here cross-depend and need to update together. - go-version: 1.21 + go-version: 1.22 # Either this action or golangci-lint needs to disable the cache cache: false - name: disarm go:embed directives to enable lint @@ -58,9 +58,9 @@ jobs: continue-on-error: true run: make upstream - name: golangci-lint - uses: golangci/golangci-lint-action@v4 + uses: golangci/golangci-lint-action@v6 with: - version: v1.55.2 + version: v1.58.0 working-directory: provider - if: failure() && github.event_name == 'push' name: Notify Slack diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 8b64380c..5e256f9d 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -22,7 +22,7 @@ env: PULUMI_MISSING_DOCS_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} PYPI_USERNAME: __token__ - PYTHONVERSION: "3.11" + PYTHONVERSION: 3.11.8 SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }} SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }} SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }} @@ -38,20 +38,21 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v4 - - name: Checkout Scripts Repo - uses: actions/checkout@v4 + - uses: pulumi/provider-version-action@v1 with: - path: ci-scripts - repository: pulumi/scripts - ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags + set-env: 'PROVIDER_VERSION' - name: Install Go uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum go-version: 1.21.x + - name: Cache examples generation + uses: actions/cache@v4 + with: + path: | + .pulumi/examples-cache + key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }} - name: Install pulumictl uses: jaxxstorm/action-install-gh-release@v1.11.0 with: @@ -99,13 +100,10 @@ jobs: run: make install_plugins - name: Update path run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH" - - name: Set PACKAGE_VERSION to Env - run: echo "PACKAGE_VERSION=$(pulumictl get version --language generic)" >> - "$GITHUB_ENV" - name: Build SDK run: make build_${{ matrix.language }} - name: Check worktree clean - run: ./ci-scripts/ci/check-worktree-is-clean + uses: pulumi/git-status-check-action@v1 - name: Compress SDK folder run: tar -zcf sdk/${{ matrix.language }}.tar.gz -C sdk/${{ matrix.language }} . - name: Upload artifacts @@ -130,6 +128,7 @@ jobs: - dotnet - go - java + generate_coverage_data: continue-on-error: true env: @@ -151,14 +150,6 @@ jobs: aws-access-key-id: ${{ secrets.AWS_CORP_S3_UPLOAD_ACCESS_KEY_ID }} aws-region: us-west-2 aws-secret-access-key: ${{ secrets.AWS_CORP_S3_UPLOAD_SECRET_ACCESS_KEY }} - - name: Checkout Scripts Repo - uses: actions/checkout@v4 - with: - path: ci-scripts - repository: pulumi/scripts - ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags - name: Install Go uses: actions/setup-go@v5 with: @@ -206,20 +197,24 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v4 - - name: Checkout Scripts Repo - uses: actions/checkout@v4 + - uses: pulumi/provider-version-action@v1 + with: + set-env: 'PROVIDER_VERSION' + - name: Cache examples generation + uses: actions/cache@v4 with: - path: ci-scripts - repository: pulumi/scripts - ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags + path: | + .pulumi/examples-cache + key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }} + - name: Prepare upstream code + run: make upstream - name: Install Go uses: actions/setup-go@v5 with: - cache-dependency-path: | - sdk/go.sum go-version: 1.21.x + cache-dependency-path: | + provider/*.sum + upstream/*.sum - name: Install pulumictl uses: jaxxstorm/action-install-gh-release@v1.11.0 with: @@ -234,8 +229,14 @@ jobs: uses: jaxxstorm/action-install-gh-release@v1.11.0 with: repo: pulumi/schema-tools - - name: Build tfgen & provider binaries - run: make provider + - name: Build schema generator binary + run: make tfgen_build_only + - name: Install plugins + run: make install_plugins + - name: Generate schema + run: make tfgen_no_deps + - name: Build provider binary + run: make provider_no_deps - name: Unit-test provider code run: make test_provider - if: github.event_name == 'pull_request' @@ -254,14 +255,38 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} comment_tag: schemaCheck message: >+ - ### Does the PR have any schema changes? - - ${{ env.SCHEMA_CHANGES }} Maintainer note: consult the [runbook](https://github.com/pulumi/platform-providers-team/blob/main/playbooks/tf-provider-updating.md) for dealing with any breaking changes. + - if: github.event_name == 'pull_request' + name: Check Configuration section + run: | + sed -n '/## Configuration/,$p' README.md | sed -n '/## Reference/q;p' >> config_section.txt + jq -r '.config | select(.variables) | .variables | keys[]' < provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json >> keys.txt + EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64) + { + echo "MISSING_CONFIG<<$EOF"; + xargs -I {} sh -c "grep -q {} config_section.txt || echo \\\`{}\\\` not found in Configuration section" < keys.txt + echo "$EOF"; + } >> "$GITHUB_ENV" + + - if: github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' + name: Comment on PR with Details of Configuration check + uses: thollander/actions-comment-pull-request@v2 + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + comment_tag: configurationCheck + message: >+ + ### Is README.md missing any configuration options? + + ${{ env.MISSING_CONFIG || 'No missing config!' }} + + + ${{ env.MISSING_CONFIG && 'Please add a description for each of these options to `README.md`.' }} + ${{ env.MISSING_CONFIG && 'Details about them can be found in either the upstream docs or `schema.json`.' }} + - name: Tar provider binaries run: tar -zcf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ github.workspace }}/bin/ pulumi-resource-${{ env.PROVIDER }} @@ -297,8 +322,6 @@ jobs: swap-storage: false - name: Checkout Repo uses: actions/checkout@v4 - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags - name: Install Go uses: actions/setup-go@v5 with: @@ -324,10 +347,12 @@ jobs: role-external-id: upload-pulumi-release role-session-name: ${{ env.PROVIDER }}@githubActions role-to-assume: ${{ secrets.AWS_UPLOAD_ROLE_ARN }} - - name: Set PreRelease Version - run: echo "GORELEASER_CURRENT_TAG=v$(pulumictl get version --language generic)" >> "$GITHUB_ENV" + - id: version + uses: pulumi/provider-version-action@v1 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v5 + env: + GORELEASER_CURRENT_TAG: v${{ steps.version.outputs.version }} with: args: -p 3 -f .goreleaser.prerelease.yml --rm-dist --skip-validate --timeout 60m0s @@ -344,10 +369,13 @@ jobs: needs: publish runs-on: ubuntu-latest steps: + - id: version + uses: pulumi/provider-version-action@v1 - name: Publish SDKs - uses: pulumi/pulumi-package-publisher@v0.0.14 + uses: pulumi/pulumi-package-publisher@v0.0.15 with: sdk: all + version: ${{ steps.version.outputs.version }} - env: SLACK_CHANNEL: provider-upgrade-publish-status SLACK_COLOR: "#FF0000" @@ -387,14 +415,9 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v4 - - name: Checkout Scripts Repo - uses: actions/checkout@v4 + - uses: pulumi/provider-version-action@v1 with: - path: ci-scripts - repository: pulumi/scripts - ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags + set-env: 'PROVIDER_VERSION' - name: Install Go uses: actions/setup-go@v5 with: @@ -496,5 +519,3 @@ on: - v* - sdk/* - "**" - -# Ensure diff with ci-mgmt \ No newline at end of file diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index c62ac89a..153ca8b1 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -23,7 +23,7 @@ env: PULUMI_MISSING_DOCS_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} PYPI_USERNAME: __token__ - PYTHONVERSION: "3.11" + PYTHONVERSION: 3.11.8 SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }} SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }} SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }} @@ -39,20 +39,21 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v4 - - name: Checkout Scripts Repo - uses: actions/checkout@v4 + - uses: pulumi/provider-version-action@v1 with: - path: ci-scripts - repository: pulumi/scripts - ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags + set-env: 'PROVIDER_VERSION' - name: Install Go uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum go-version: 1.21.x + - name: Cache examples generation + uses: actions/cache@v4 + with: + path: | + .pulumi/examples-cache + key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }} - name: Install pulumictl uses: jaxxstorm/action-install-gh-release@v1.11.0 with: @@ -100,13 +101,10 @@ jobs: run: make install_plugins - name: Update path run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH" - - name: Set PACKAGE_VERSION to Env - run: echo "PACKAGE_VERSION=$(pulumictl get version --language generic)" >> - "$GITHUB_ENV" - name: Build SDK run: make build_${{ matrix.language }} - name: Check worktree clean - run: ./ci-scripts/ci/check-worktree-is-clean + uses: pulumi/git-status-check-action@v1 - name: Compress SDK folder run: tar -zcf sdk/${{ matrix.language }}.tar.gz -C sdk/${{ matrix.language }} . - name: Upload artifacts @@ -114,6 +112,7 @@ jobs: with: name: ${{ matrix.language }}-sdk.tar.gz path: ${{ github.workspace}}/sdk/${{ matrix.language }}.tar.gz + retention-days: 30 - if: failure() && github.event_name == 'push' name: Notify Slack uses: 8398a7/action-slack@v3 @@ -130,6 +129,7 @@ jobs: - dotnet - go - java + lint: name: lint uses: ./.github/workflows/lint.yml @@ -144,20 +144,24 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v4 - - name: Checkout Scripts Repo - uses: actions/checkout@v4 + - uses: pulumi/provider-version-action@v1 + with: + set-env: 'PROVIDER_VERSION' + - name: Cache examples generation + uses: actions/cache@v4 with: - path: ci-scripts - repository: pulumi/scripts - ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags + path: | + .pulumi/examples-cache + key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }} + - name: Prepare upstream code + run: make upstream - name: Install Go uses: actions/setup-go@v5 with: - cache-dependency-path: | - sdk/go.sum go-version: 1.21.x + cache-dependency-path: | + provider/*.sum + upstream/*.sum - name: Install pulumictl uses: jaxxstorm/action-install-gh-release@v1.11.0 with: @@ -172,8 +176,14 @@ jobs: uses: jaxxstorm/action-install-gh-release@v1.11.0 with: repo: pulumi/schema-tools - - name: Build tfgen & provider binaries - run: make provider + - name: Build schema generator binary + run: make tfgen_build_only + - name: Install plugins + run: make install_plugins + - name: Generate schema + run: make tfgen_no_deps + - name: Build provider binary + run: make provider_no_deps - name: Unit-test provider code run: make test_provider - if: github.event_name == 'pull_request' @@ -192,14 +202,38 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} comment_tag: schemaCheck message: >+ - ### Does the PR have any schema changes? - - ${{ env.SCHEMA_CHANGES }} Maintainer note: consult the [runbook](https://github.com/pulumi/platform-providers-team/blob/main/playbooks/tf-provider-updating.md) for dealing with any breaking changes. + - if: github.event_name == 'pull_request' + name: Check Configuration section + run: | + sed -n '/## Configuration/,$p' README.md | sed -n '/## Reference/q;p' >> config_section.txt + jq -r '.config | select(.variables) | .variables | keys[]' < provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json >> keys.txt + EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64) + { + echo "MISSING_CONFIG<<$EOF"; + xargs -I {} sh -c "grep -q {} config_section.txt || echo \\\`{}\\\` not found in Configuration section" < keys.txt + echo "$EOF"; + } >> "$GITHUB_ENV" + + - if: github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' + name: Comment on PR with Details of Configuration check + uses: thollander/actions-comment-pull-request@v2 + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + comment_tag: configurationCheck + message: >+ + ### Is README.md missing any configuration options? + + ${{ env.MISSING_CONFIG || 'No missing config!' }} + + + ${{ env.MISSING_CONFIG && 'Please add a description for each of these options to `README.md`.' }} + ${{ env.MISSING_CONFIG && 'Details about them can be found in either the upstream docs or `schema.json`.' }} + - name: Tar provider binaries run: tar -zcf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ github.workspace }}/bin/ pulumi-resource-${{ env.PROVIDER }} @@ -235,8 +269,6 @@ jobs: swap-storage: false - name: Checkout Repo uses: actions/checkout@v4 - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags - name: Install Go uses: actions/setup-go@v5 with: @@ -262,10 +294,12 @@ jobs: role-external-id: upload-pulumi-release role-session-name: ${{ env.PROVIDER }}@githubActions role-to-assume: ${{ secrets.AWS_UPLOAD_ROLE_ARN }} - - name: Set PreRelease Version - run: echo "GORELEASER_CURRENT_TAG=v$(pulumictl get version --language generic)" >> "$GITHUB_ENV" + - id: version + uses: pulumi/provider-version-action@v1 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v5 + env: + GORELEASER_CURRENT_TAG: v${{ steps.version.outputs.version }} with: args: -p 3 -f .goreleaser.prerelease.yml --rm-dist --skip-validate --timeout 60m0s @@ -282,10 +316,13 @@ jobs: needs: publish runs-on: ubuntu-latest steps: + - id: version + uses: pulumi/provider-version-action@v1 - name: Publish SDKs - uses: pulumi/pulumi-package-publisher@v0.0.14 + uses: pulumi/pulumi-package-publisher@v0.0.15 with: sdk: all + version: ${{ steps.version.outputs.version }} - env: SLACK_CHANNEL: provider-upgrade-publish-status SLACK_COLOR: "#FF0000" @@ -307,14 +344,9 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v4 - - name: Checkout Scripts Repo - uses: actions/checkout@v4 + - uses: pulumi/provider-version-action@v1 with: - path: ci-scripts - repository: pulumi/scripts - ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags + set-env: 'PROVIDER_VERSION' - name: Install Go uses: actions/setup-go@v5 with: diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 7dfd5be7..a5de7e55 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -22,7 +22,7 @@ env: PULUMI_MISSING_DOCS_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} PYPI_USERNAME: __token__ - PYTHONVERSION: "3.11" + PYTHONVERSION: 3.11.8 SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }} SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }} SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e8116f2e..7767481d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ env: PULUMI_MISSING_DOCS_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} PYPI_USERNAME: __token__ - PYTHONVERSION: "3.11" + PYTHONVERSION: 3.11.8 SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }} SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }} SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }} @@ -38,20 +38,21 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v4 - - name: Checkout Scripts Repo - uses: actions/checkout@v4 + - uses: pulumi/provider-version-action@v1 with: - path: ci-scripts - repository: pulumi/scripts - ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags + set-env: 'PROVIDER_VERSION' - name: Install Go uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum go-version: 1.21.x + - name: Cache examples generation + uses: actions/cache@v4 + with: + path: | + .pulumi/examples-cache + key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }} - name: Install pulumictl uses: jaxxstorm/action-install-gh-release@v1.11.0 with: @@ -99,13 +100,10 @@ jobs: run: make install_plugins - name: Update path run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH" - - name: Set PACKAGE_VERSION to Env - run: echo "PACKAGE_VERSION=$(pulumictl get version --language generic)" >> - "$GITHUB_ENV" - name: Build SDK run: make build_${{ matrix.language }} - name: Check worktree clean - run: ./ci-scripts/ci/check-worktree-is-clean + uses: pulumi/git-status-check-action@v1 - name: Compress SDK folder run: tar -zcf sdk/${{ matrix.language }}.tar.gz -C sdk/${{ matrix.language }} . - name: Upload artifacts @@ -113,6 +111,7 @@ jobs: with: name: ${{ matrix.language }}-sdk.tar.gz path: ${{ github.workspace}}/sdk/${{ matrix.language }}.tar.gz + retention-days: 30 - if: failure() && github.event_name == 'push' name: Notify Slack uses: 8398a7/action-slack@v3 @@ -129,6 +128,7 @@ jobs: - dotnet - go - java + create_docs_build: name: create_docs_build needs: tag_sdk @@ -158,20 +158,24 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v4 - - name: Checkout Scripts Repo - uses: actions/checkout@v4 + - uses: pulumi/provider-version-action@v1 + with: + set-env: 'PROVIDER_VERSION' + - name: Cache examples generation + uses: actions/cache@v4 with: - path: ci-scripts - repository: pulumi/scripts - ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags + path: | + .pulumi/examples-cache + key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }} + - name: Prepare upstream code + run: make upstream - name: Install Go uses: actions/setup-go@v5 with: - cache-dependency-path: | - sdk/go.sum go-version: 1.21.x + cache-dependency-path: | + provider/*.sum + upstream/*.sum - name: Install pulumictl uses: jaxxstorm/action-install-gh-release@v1.11.0 with: @@ -186,8 +190,14 @@ jobs: uses: jaxxstorm/action-install-gh-release@v1.11.0 with: repo: pulumi/schema-tools - - name: Build tfgen & provider binaries - run: make provider + - name: Build schema generator binary + run: make tfgen_build_only + - name: Install plugins + run: make install_plugins + - name: Generate schema + run: make tfgen_no_deps + - name: Build provider binary + run: make provider_no_deps - name: Unit-test provider code run: make test_provider - if: github.event_name == 'pull_request' @@ -206,14 +216,38 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} comment_tag: schemaCheck message: >+ - ### Does the PR have any schema changes? - - ${{ env.SCHEMA_CHANGES }} Maintainer note: consult the [runbook](https://github.com/pulumi/platform-providers-team/blob/main/playbooks/tf-provider-updating.md) for dealing with any breaking changes. + - if: github.event_name == 'pull_request' + name: Check Configuration section + run: | + sed -n '/## Configuration/,$p' README.md | sed -n '/## Reference/q;p' >> config_section.txt + jq -r '.config | select(.variables) | .variables | keys[]' < provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json >> keys.txt + EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64) + { + echo "MISSING_CONFIG<<$EOF"; + xargs -I {} sh -c "grep -q {} config_section.txt || echo \\\`{}\\\` not found in Configuration section" < keys.txt + echo "$EOF"; + } >> "$GITHUB_ENV" + + - if: github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' + name: Comment on PR with Details of Configuration check + uses: thollander/actions-comment-pull-request@v2 + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + comment_tag: configurationCheck + message: >+ + ### Is README.md missing any configuration options? + + ${{ env.MISSING_CONFIG || 'No missing config!' }} + + + ${{ env.MISSING_CONFIG && 'Please add a description for each of these options to `README.md`.' }} + ${{ env.MISSING_CONFIG && 'Details about them can be found in either the upstream docs or `schema.json`.' }} + - name: Tar provider binaries run: tar -zcf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ github.workspace }}/bin/ pulumi-resource-${{ env.PROVIDER }} @@ -249,8 +283,6 @@ jobs: swap-storage: false - name: Checkout Repo uses: actions/checkout@v4 - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags - name: Install Go uses: actions/setup-go@v5 with: @@ -276,10 +308,12 @@ jobs: role-external-id: upload-pulumi-release role-session-name: ${{ env.PROVIDER }}@githubActions role-to-assume: ${{ secrets.AWS_UPLOAD_ROLE_ARN }} - - name: Set PreRelease Version - run: echo "GORELEASER_CURRENT_TAG=v$(pulumictl get version --language generic)" >> "$GITHUB_ENV" + - id: version + uses: pulumi/provider-version-action@v1 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v5 + env: + GORELEASER_CURRENT_TAG: v${{ steps.version.outputs.version }} with: args: -p 3 release --rm-dist --timeout 60m0s version: latest @@ -295,10 +329,13 @@ jobs: needs: publish runs-on: ubuntu-latest steps: + - id: version + uses: pulumi/provider-version-action@v1 - name: Publish SDKs - uses: pulumi/pulumi-package-publisher@v0.0.14 + uses: pulumi/pulumi-package-publisher@v0.0.15 with: sdk: all + version: ${{ steps.version.outputs.version }} - env: SLACK_CHANNEL: provider-upgrade-publish-status SLACK_COLOR: "#FF0000" @@ -322,9 +359,11 @@ jobs: with: tag: v0.0.46 repo: pulumi/pulumictl + - id: version + uses: pulumi/provider-version-action@v1 - name: Add SDK version tag - run: git tag "sdk/v$(pulumictl get version --language generic)" && git push origin - "sdk/v$(pulumictl get version --language generic)" + run: git tag "sdk/v${{ steps.version.outputs.version }}" && git push origin + "sdk/v${{ steps.version.outputs.version }}" clean_up_release_labels: name: Clean up release labels @@ -334,8 +373,6 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v4 - - name: Unshallow clone for PR merge bases - run: git fetch --prune --unshallow --tags - name: Clean up release labels uses: pulumi/action-release-by-pr-label@main with: @@ -355,14 +392,9 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v4 - - name: Checkout Scripts Repo - uses: actions/checkout@v4 + - uses: pulumi/provider-version-action@v1 with: - path: ci-scripts - repository: pulumi/scripts - ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags + set-env: 'PROVIDER_VERSION' - name: Install Go uses: actions/setup-go@v5 with: diff --git a/.github/workflows/resync-build.yml b/.github/workflows/resync-build.yml index 4af7f52a..72bc762f 100644 --- a/.github/workflows/resync-build.yml +++ b/.github/workflows/resync-build.yml @@ -24,7 +24,7 @@ env: PULUMI_MISSING_DOCS_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} PYPI_USERNAME: __token__ - PYTHONVERSION: "3.11" + PYTHONVERSION: 3.11.8 SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }} SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }} SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }} @@ -47,8 +47,6 @@ jobs: - id: run-url name: Create URL to the run output run: echo "run-url=https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" >> "$GITHUB_OUTPUT" - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags - name: Install Go uses: actions/setup-go@v5 with: diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index ecc6096c..b289a197 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -23,7 +23,7 @@ env: PULUMI_MISSING_DOCS_ERROR: true PYPI_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} PYPI_USERNAME: __token__ - PYTHONVERSION: "3.11" + PYTHONVERSION: 3.11.8 SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }} SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }} SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }} @@ -48,20 +48,21 @@ jobs: uses: actions/checkout@v4 with: ref: ${{ env.PR_COMMIT_SHA }} - - name: Checkout Scripts Repo - uses: actions/checkout@v4 + - uses: pulumi/provider-version-action@v1 with: - path: ci-scripts - repository: pulumi/scripts - ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags + set-env: 'PROVIDER_VERSION' - name: Install Go uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum go-version: 1.21.x + - name: Cache examples generation + uses: actions/cache@v4 + with: + path: | + .pulumi/examples-cache + key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }} - name: Install pulumictl uses: jaxxstorm/action-install-gh-release@v1.11.0 with: @@ -109,13 +110,10 @@ jobs: run: make install_plugins - name: Update path run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH" - - name: Set PACKAGE_VERSION to Env - run: echo "PACKAGE_VERSION=$(pulumictl get version --language generic)" >> - "$GITHUB_ENV" - name: Build SDK run: make build_${{ matrix.language }} - name: Check worktree clean - run: ./ci-scripts/ci/check-worktree-is-clean + uses: pulumi/git-status-check-action@v1 - name: Compress SDK folder run: tar -zcf sdk/${{ matrix.language }}.tar.gz -C sdk/${{ matrix.language }} . - name: Upload artifacts @@ -140,6 +138,7 @@ jobs: - dotnet - go - java + comment-notification: if: github.event_name == 'repository_dispatch' name: comment-notification @@ -169,20 +168,24 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v4 - - name: Checkout Scripts Repo - uses: actions/checkout@v4 + - uses: pulumi/provider-version-action@v1 with: - path: ci-scripts - repository: pulumi/scripts - ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags + set-env: 'PROVIDER_VERSION' + - name: Cache examples generation + uses: actions/cache@v4 + with: + path: | + .pulumi/examples-cache + key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }} + - name: Prepare upstream code + run: make upstream - name: Install Go uses: actions/setup-go@v5 with: - cache-dependency-path: | - sdk/go.sum go-version: 1.21.x + cache-dependency-path: | + provider/*.sum + upstream/*.sum - name: Install pulumictl uses: jaxxstorm/action-install-gh-release@v1.11.0 with: @@ -197,8 +200,14 @@ jobs: uses: jaxxstorm/action-install-gh-release@v1.11.0 with: repo: pulumi/schema-tools - - name: Build tfgen & provider binaries - run: make provider + - name: Build schema generator binary + run: make tfgen_build_only + - name: Install plugins + run: make install_plugins + - name: Generate schema + run: make tfgen_no_deps + - name: Build provider binary + run: make provider_no_deps - name: Unit-test provider code run: make test_provider - if: github.event_name == 'pull_request' @@ -217,14 +226,38 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} comment_tag: schemaCheck message: >+ - ### Does the PR have any schema changes? - - ${{ env.SCHEMA_CHANGES }} Maintainer note: consult the [runbook](https://github.com/pulumi/platform-providers-team/blob/main/playbooks/tf-provider-updating.md) for dealing with any breaking changes. + - if: github.event_name == 'pull_request' + name: Check Configuration section + run: | + sed -n '/## Configuration/,$p' README.md | sed -n '/## Reference/q;p' >> config_section.txt + jq -r '.config | select(.variables) | .variables | keys[]' < provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json >> keys.txt + EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64) + { + echo "MISSING_CONFIG<<$EOF"; + xargs -I {} sh -c "grep -q {} config_section.txt || echo \\\`{}\\\` not found in Configuration section" < keys.txt + echo "$EOF"; + } >> "$GITHUB_ENV" + + - if: github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' + name: Comment on PR with Details of Configuration check + uses: thollander/actions-comment-pull-request@v2 + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + comment_tag: configurationCheck + message: >+ + ### Is README.md missing any configuration options? + + ${{ env.MISSING_CONFIG || 'No missing config!' }} + + + ${{ env.MISSING_CONFIG && 'Please add a description for each of these options to `README.md`.' }} + ${{ env.MISSING_CONFIG && 'Details about them can be found in either the upstream docs or `schema.json`.' }} + - name: Tar provider binaries run: tar -zcf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ github.workspace }}/bin/ pulumi-resource-${{ env.PROVIDER }} @@ -298,20 +331,15 @@ jobs: uses: actions/checkout@v4 with: ref: ${{ env.PR_COMMIT_SHA }} - - name: Checkout Scripts Repo - uses: actions/checkout@v4 + - uses: pulumi/provider-version-action@v1 with: - path: ci-scripts - repository: pulumi/scripts - ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 + set-env: 'PROVIDER_VERSION' - name: Checkout p/examples if: matrix.testTarget == 'pulumiExamples' uses: actions/checkout@v4 with: repository: pulumi/examples path: p-examples - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags - name: Install Go uses: actions/setup-go@v5 with: diff --git a/Makefile b/Makefile index e80811f7..dc2aab28 100644 --- a/Makefile +++ b/Makefile @@ -7,13 +7,18 @@ PROVIDER_PATH := provider VERSION_PATH := $(PROVIDER_PATH)/pkg/version.Version TFGEN := pulumi-tfgen-$(PACK) PROVIDER := pulumi-resource-$(PACK) -VERSION := $(shell pulumictl get version) JAVA_GEN := pulumi-java-gen TESTPARALLELISM := 10 WORKING_DIR := $(shell pwd) PULUMI_PROVIDER_BUILD_PARALLELISM ?= -p 2 PULUMI_CONVERT := 1 +# Override during CI using `make [TARGET] PROVIDER_VERSION=""` or by setting a PROVIDER_VERSION environment variable +# Local & branch builds will just used this fixed default version unless specified +PROVIDER_VERSION ?= 1.0.0-alpha.0+dev +# Use this normalised version everywhere rather than the raw input to ensure consistency. +VERSION_GENERIC = $(shell pulumictl convert-version --language generic --version "$(PROVIDER_VERSION)") + development: install_plugins provider build_sdks install_sdks build: install_plugins provider build_sdks install_sdks @@ -30,35 +35,39 @@ install_sdks: install_dotnet_sdk install_python_sdk install_nodejs_sdk install_j only_build: build -build_dotnet: DOTNET_VERSION := $(shell pulumictl get version --language dotnet) +build_dotnet: DOTNET_VERSION := $(shell pulumictl convert-version --language dotnet -v "$(VERSION_GENERIC)") build_dotnet: export PULUMI_HOME := $(WORKING_DIR)/.pulumi build_dotnet: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH) +build_dotnet: export PULUMI_CONVERT_EXAMPLES_CACHE_DIR := $(WORKING_DIR)/.pulumi/examples-cache build_dotnet: upstream - pulumictl get version --language dotnet PULUMI_CONVERT=$(PULUMI_CONVERT) PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION=$(PULUMI_CONVERT) $(WORKING_DIR)/bin/$(TFGEN) dotnet --out sdk/dotnet/ cd sdk/dotnet/ && \ printf "module fake_dotnet_module // Exclude this directory from Go tools\n\ngo 1.17\n" > go.mod && \ - echo "$(DOTNET_VERSION)" >version.txt && \ + echo "$(VERSION_GENERIC)" >version.txt && \ dotnet build /p:Version=$(DOTNET_VERSION) build_go: export PULUMI_HOME := $(WORKING_DIR)/.pulumi build_go: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH) +build_go: export PULUMI_CONVERT_EXAMPLES_CACHE_DIR := $(WORKING_DIR)/.pulumi/examples-cache build_go: upstream PULUMI_CONVERT=$(PULUMI_CONVERT) PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION=$(PULUMI_CONVERT) $(WORKING_DIR)/bin/$(TFGEN) go --out sdk/go/ cd sdk && go list "$$(grep -e "^module" go.mod | cut -d ' ' -f 2)/go/..." | xargs -I {} bash -c 'go build {} && go clean -i {}' -build_java: PACKAGE_VERSION := $(shell pulumictl get version --language generic) +build_java: PACKAGE_VERSION := $(VERSION_GENERIC) build_java: export PULUMI_HOME := $(WORKING_DIR)/.pulumi build_java: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH) +build_java: export PULUMI_CONVERT_EXAMPLES_CACHE_DIR := $(WORKING_DIR)/.pulumi/examples-cache build_java: bin/pulumi-java-gen upstream $(WORKING_DIR)/bin/$(JAVA_GEN) generate --schema provider/cmd/$(PROVIDER)/schema.json --out sdk/java --build gradle-nexus cd sdk/java/ && \ printf "module fake_java_module // Exclude this directory from Go tools\n\ngo 1.17\n" > go.mod && \ - gradle --console=plain build + gradle --console=plain build && \ + gradle --console=plain javadoc -build_nodejs: VERSION := $(shell pulumictl get version --language javascript) +build_nodejs: NODE_VERSION := $(shell pulumictl convert-version --language javascript -v "$(VERSION_GENERIC)") build_nodejs: export PULUMI_HOME := $(WORKING_DIR)/.pulumi build_nodejs: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH) +build_nodejs: export PULUMI_CONVERT_EXAMPLES_CACHE_DIR := $(WORKING_DIR)/.pulumi/examples-cache build_nodejs: upstream PULUMI_CONVERT=$(PULUMI_CONVERT) PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION=$(PULUMI_CONVERT) $(WORKING_DIR)/bin/$(TFGEN) nodejs --out sdk/nodejs/ cd sdk/nodejs/ && \ @@ -66,11 +75,12 @@ build_nodejs: upstream yarn install && \ yarn run tsc && \ cp ../../README.md ../../LICENSE* package.json yarn.lock ./bin/ && \ - sed -i.bak -e "s/\$${VERSION}/$(VERSION)/g" ./bin/package.json + sed -i.bak -e "s/\$${VERSION}/$(NODE_VERSION)/g" ./bin/package.json -build_python: PYPI_VERSION := $(shell pulumictl get version --language python) +build_python: PYPI_VERSION := $(shell pulumictl convert-version --language python -v "$(VERSION_GENERIC)") build_python: export PULUMI_HOME := $(WORKING_DIR)/.pulumi build_python: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH) +build_python: export PULUMI_CONVERT_EXAMPLES_CACHE_DIR := $(WORKING_DIR)/.pulumi/examples-cache build_python: upstream rm -rf sdk/python/ PULUMI_CONVERT=$(PULUMI_CONVERT) PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION=$(PULUMI_CONVERT) $(WORKING_DIR)/bin/$(TFGEN) python --out sdk/python/ @@ -123,7 +133,7 @@ lint_provider.fix: # `cmd/pulumi-resource-xyz/schema.json` is valid and up to date. # To create a release ready binary, you should use `make provider`. provider_no_deps: - (cd provider && go build $(PULUMI_PROVIDER_BUILD_PARALLELISM) -o $(WORKING_DIR)/bin/$(PROVIDER) -ldflags "-X $(PROJECT)/$(VERSION_PATH)=$(VERSION)" $(PROJECT)/$(PROVIDER_PATH)/cmd/$(PROVIDER)) + (cd provider && go build $(PULUMI_PROVIDER_BUILD_PARALLELISM) -o $(WORKING_DIR)/bin/$(PROVIDER) -ldflags "-X $(PROJECT)/$(VERSION_PATH)=$(VERSION_GENERIC)" $(PROJECT)/$(PROVIDER_PATH)/cmd/$(PROVIDER)) provider: tfgen provider_no_deps @@ -137,15 +147,19 @@ test_provider: @echo "" cd provider && go test -v -short ./... -parallel $(TESTPARALLELISM) -tfgen: export PULUMI_HOME := $(WORKING_DIR)/.pulumi -tfgen: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH) -tfgen: install_plugins upstream - (cd provider && go build $(PULUMI_PROVIDER_BUILD_PARALLELISM) -o $(WORKING_DIR)/bin/$(TFGEN) -ldflags "-X $(PROJECT)/$(VERSION_PATH)=$(VERSION)" $(PROJECT)/$(PROVIDER_PATH)/cmd/$(TFGEN)) - PULUMI_CONVERT=$(PULUMI_CONVERT) PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION=$(PULUMI_CONVERT) $(WORKING_DIR)/bin/$(TFGEN) schema --out provider/cmd/$(PROVIDER) - (cd provider && VERSION=$(VERSION) go generate cmd/$(PROVIDER)/main.go) +tfgen: install_plugins upstream tfgen_no_deps + +tfgen_no_deps: export PULUMI_HOME := $(WORKING_DIR)/.pulumi +tfgen_no_deps: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH) +tfgen_no_deps: export PULUMI_CONVERT := $(PULUMI_CONVERT) +tfgen_no_deps: export PULUMI_CONVERT_EXAMPLES_CACHE_DIR := $(WORKING_DIR)/.pulumi/examples-cache +tfgen_no_deps: export PULUMI_DISABLE_AUTOMATIC_PLUGIN_ACQUISITION := $(PULUMI_CONVERT) +tfgen_no_deps: tfgen_build_only + $(WORKING_DIR)/bin/$(TFGEN) schema --out provider/cmd/$(PROVIDER) + (cd provider && VERSION=$(VERSION_GENERIC) go generate cmd/$(PROVIDER)/main.go) tfgen_build_only: - (cd provider && go build $(PULUMI_PROVIDER_BUILD_PARALLELISM) -o $(WORKING_DIR)/bin/$(TFGEN) -ldflags "-X $(PROJECT)/$(VERSION_PATH)=$(VERSION)" $(PROJECT)/$(PROVIDER_PATH)/cmd/$(TFGEN)) + (cd provider && go build $(PULUMI_PROVIDER_BUILD_PARALLELISM) -o $(WORKING_DIR)/bin/$(TFGEN) -ldflags "-X $(PROJECT)/$(VERSION_PATH)=$(VERSION_GENERIC)" $(PROJECT)/$(PROVIDER_PATH)/cmd/$(TFGEN)) upstream: ifneq ("$(wildcard upstream)","") diff --git a/devbox.json b/devbox.json index 6b9c10cd..4e2ed2c3 100644 --- a/devbox.json +++ b/devbox.json @@ -4,7 +4,7 @@ "pulumictl@latest", "go@1.21.", "nodejs@20.", - "python3@3.11", + "python3@3.11.8", "dotnet-sdk@6.0.", "gradle_7@7.6" ], diff --git a/scripts/upstream.sh b/scripts/upstream.sh index eddf7df1..7d35e3b6 100755 --- a/scripts/upstream.sh +++ b/scripts/upstream.sh @@ -176,7 +176,7 @@ end_rebase() { rm patches/*.patch cd upstream - git format-patch local -o ../patches --zero-commit --no-signature --no-stat + git format-patch local -o ../patches --zero-commit --no-signature --no-stat --no-numbered cd .. rm rebase-in-progress apply "$1"