diff --git a/.github/workflows/artifact-cleanup.yml b/.github/workflows/artifact-cleanup.yml deleted file mode 100644 index 63b7d5a..0000000 --- a/.github/workflows/artifact-cleanup.yml +++ /dev/null @@ -1,15 +0,0 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt - -jobs: - remove-old-artifacts: - runs-on: ubuntu-latest - steps: - - name: Remove old artifacts - uses: c-hive/gha-remove-artifacts@v1 - with: - age: 1 month - skip-tags: true -name: cleanup -on: - schedule: - - cron: 0 1 * * * diff --git a/.github/workflows/command-dispatch.yml b/.github/workflows/command-dispatch.yml index 9df2859..d99af8f 100644 --- a/.github/workflows/command-dispatch.yml +++ b/.github/workflows/command-dispatch.yml @@ -7,6 +7,7 @@ env: 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GOVERSION: 1.20.1 + HTTP_TOKEN: ${{ secrets.HTTP_TOKEN }} JAVAVERSION: "11" NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} NODEVERSION: 16.x diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e0a5a8c..e4694b5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,12 +1,13 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: "http" + PROVIDER: http DOTNETVERSION: | 6.0.x 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GOVERSION: 1.20.1 + HTTP_TOKEN: ${{ secrets.HTTP_TOKEN }} JAVAVERSION: "11" NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} NODEVERSION: 16.x @@ -103,6 +104,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 @@ -170,75 +172,6 @@ jobs: s3FullURI="s3://${{ secrets.S3_COVERAGE_BUCKET_NAME }}/summaries/${summaryName}" aws s3 cp "${{ env.COVERAGE_OUTPUT_DIR }}/summary.json" "${s3FullURI}" --acl bucket-owner-full-control - lint: - container: golangci/golangci-lint:v1.51 - name: lint - runs-on: ubuntu-latest - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - - name: Checkout Scripts Repo - uses: actions/checkout@v3 - with: - path: ci-scripts - repository: pulumi/scripts - - name: Mark repo as safe directory - run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER }}/pulumi-${{ env.PROVIDER }} - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags - - name: Install Go - uses: actions/setup-go@v3 - with: - go-version: 1.20.1 - - 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 - - run: make lint_provider - - if: failure() && github.event_name == 'push' - name: Notify Slack - uses: 8398a7/action-slack@v3 - with: - author_name: Failure in linting provider - fields: repo,commit,author,action - status: ${{ job.status }} - lint_sdk: - container: golangci/golangci-lint:v1.51 - name: lint-sdk - needs: build_sdk - runs-on: ubuntu-latest - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - - name: Checkout Scripts Repo - uses: actions/checkout@v3 - with: - path: ci-scripts - repository: pulumi/scripts - - name: Mark repo as safe directory - run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER }}/pulumi-${{ env.PROVIDER }} - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags - - name: Install Go - uses: actions/setup-go@v3 - with: - go-version: 1.20.1 - - 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 - - run: cd sdk/go/http && golangci-lint run -c ../../../.golangci.yml - - if: failure() && github.event_name == 'push' - name: Notify Slack - uses: 8398a7/action-slack@v3 - with: - author_name: Failure in linting go sdk - fields: repo,commit,author,action - status: ${{ job.status }} prerequisites: name: prerequisites runs-on: ubuntu-latest @@ -302,6 +235,7 @@ jobs: with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin/provider.tar.gz + retention-days: 30 - if: failure() && github.event_name == 'push' name: Notify Slack uses: 8398a7/action-slack@v3 @@ -359,7 +293,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Publish SDKs - uses: pulumi/pulumi-package-publisher@v0.0.7 + uses: pulumi/pulumi-package-publisher@v0.0.9 - env: SLACK_CHANNEL: provider-upgrade-publish-status SLACK_COLOR: "#FF0000" diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 094ab77..b513ac9 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -1,12 +1,13 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: "http" + PROVIDER: http DOTNETVERSION: | 6.0.x 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GOVERSION: 1.20.1 + HTTP_TOKEN: ${{ secrets.HTTP_TOKEN }} JAVAVERSION: "11" NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} NODEVERSION: 16.x @@ -103,6 +104,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 @@ -170,75 +172,6 @@ jobs: s3FullURI="s3://${{ secrets.S3_COVERAGE_BUCKET_NAME }}/summaries/${summaryName}" aws s3 cp "${{ env.COVERAGE_OUTPUT_DIR }}/summary.json" "${s3FullURI}" --acl bucket-owner-full-control - lint: - container: golangci/golangci-lint:v1.51 - name: lint - runs-on: ubuntu-latest - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - - name: Checkout Scripts Repo - uses: actions/checkout@v3 - with: - path: ci-scripts - repository: pulumi/scripts - - name: Mark repo as safe directory - run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER }}/pulumi-${{ env.PROVIDER }} - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags - - name: Install Go - uses: actions/setup-go@v3 - with: - go-version: 1.20.1 - - 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 - - run: make lint_provider - - if: failure() && github.event_name == 'push' - name: Notify Slack - uses: 8398a7/action-slack@v3 - with: - author_name: Failure in linting provider - fields: repo,commit,author,action - status: ${{ job.status }} - lint_sdk: - container: golangci/golangci-lint:v1.51 - name: lint-sdk - needs: build_sdk - runs-on: ubuntu-latest - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - - name: Checkout Scripts Repo - uses: actions/checkout@v3 - with: - path: ci-scripts - repository: pulumi/scripts - - name: Mark repo as safe directory - run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER }}/pulumi-${{ env.PROVIDER }} - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags - - name: Install Go - uses: actions/setup-go@v3 - with: - go-version: 1.20.1 - - 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 - - run: cd sdk/go/http && golangci-lint run -c ../../../.golangci.yml - - if: failure() && github.event_name == 'push' - name: Notify Slack - uses: 8398a7/action-slack@v3 - with: - author_name: Failure in linting go sdk - fields: repo,commit,author,action - status: ${{ job.status }} prerequisites: name: prerequisites runs-on: ubuntu-latest @@ -302,6 +235,7 @@ jobs: with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin/provider.tar.gz + retention-days: 30 - if: failure() && github.event_name == 'push' name: Notify Slack uses: 8398a7/action-slack@v3 @@ -359,7 +293,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Publish SDKs - uses: pulumi/pulumi-package-publisher@v0.0.7 + uses: pulumi/pulumi-package-publisher@v0.0.9 - env: SLACK_CHANNEL: provider-upgrade-publish-status SLACK_COLOR: "#FF0000" diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 3fe6024..320c7e1 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -1,13 +1,14 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: "http" + PROVIDER: http IS_PRERELEASE: true DOTNETVERSION: | 6.0.x 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GOVERSION: 1.20.1 + HTTP_TOKEN: ${{ secrets.HTTP_TOKEN }} JAVAVERSION: "11" NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} NODEVERSION: 16.x @@ -120,75 +121,6 @@ jobs: - dotnet - go - java - lint: - container: golangci/golangci-lint:v1.51 - name: lint - runs-on: ubuntu-latest - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - - name: Checkout Scripts Repo - uses: actions/checkout@v3 - with: - path: ci-scripts - repository: pulumi/scripts - - name: Mark repo as safe directory - run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER }}/pulumi-${{ env.PROVIDER }} - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags - - name: Install Go - uses: actions/setup-go@v3 - with: - go-version: 1.20.1 - - 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 - - run: make lint_provider - - if: failure() && github.event_name == 'push' - name: Notify Slack - uses: 8398a7/action-slack@v3 - with: - author_name: Failure in linting provider - fields: repo,commit,author,action - status: ${{ job.status }} - lint_sdk: - container: golangci/golangci-lint:v1.51 - name: lint-sdk - needs: build_sdk - runs-on: ubuntu-latest - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - - name: Checkout Scripts Repo - uses: actions/checkout@v3 - with: - path: ci-scripts - repository: pulumi/scripts - - name: Mark repo as safe directory - run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER }}/pulumi-${{ env.PROVIDER }} - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags - - name: Install Go - uses: actions/setup-go@v3 - with: - go-version: 1.20.1 - - 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 - - run: cd sdk/go/http && golangci-lint run -c ../../../.golangci.yml - - if: failure() && github.event_name == 'push' - name: Notify Slack - uses: 8398a7/action-slack@v3 - with: - author_name: Failure in linting go sdk - fields: repo,commit,author,action - status: ${{ job.status }} prerequisites: name: prerequisites runs-on: ubuntu-latest @@ -309,7 +241,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Publish SDKs - uses: pulumi/pulumi-package-publisher@v0.0.7 + uses: pulumi/pulumi-package-publisher@v0.0.9 - env: SLACK_CHANNEL: provider-upgrade-publish-status SLACK_COLOR: "#FF0000" diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 4371579..8525f83 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -1,12 +1,13 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: "http" + PROVIDER: http DOTNETVERSION: | 6.0.x 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GOVERSION: 1.20.1 + HTTP_TOKEN: ${{ secrets.HTTP_TOKEN }} JAVAVERSION: "11" NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} NODEVERSION: 16.x diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 09f487f..bf9df29 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,12 +1,13 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: "http" + PROVIDER: http DOTNETVERSION: | 6.0.x 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GOVERSION: 1.20.1 + HTTP_TOKEN: ${{ secrets.HTTP_TOKEN }} JAVAVERSION: "11" NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} NODEVERSION: 16.x @@ -119,89 +120,6 @@ jobs: - dotnet - go - java - create_docs_build: - name: create_docs_build - needs: tag_sdk - runs-on: ubuntu-latest - steps: - - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 - with: - repo: pulumi/pulumictl - - env: - GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }} - name: Dispatch Event - run: pulumictl create docs-build pulumi-${{ env.PROVIDER }} - "${GITHUB_REF#refs/tags/}" - lint: - container: golangci/golangci-lint:v1.51 - name: lint - runs-on: ubuntu-latest - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - - name: Checkout Scripts Repo - uses: actions/checkout@v3 - with: - path: ci-scripts - repository: pulumi/scripts - - name: Mark repo as safe directory - run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER }}/pulumi-${{ env.PROVIDER }} - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags - - name: Install Go - uses: actions/setup-go@v3 - with: - go-version: 1.20.1 - - 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 - - run: make lint_provider - - if: failure() && github.event_name == 'push' - name: Notify Slack - uses: 8398a7/action-slack@v3 - with: - author_name: Failure in linting provider - fields: repo,commit,author,action - status: ${{ job.status }} - lint_sdk: - container: golangci/golangci-lint:v1.51 - name: lint-sdk - needs: build_sdk - runs-on: ubuntu-latest - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - - name: Checkout Scripts Repo - uses: actions/checkout@v3 - with: - path: ci-scripts - repository: pulumi/scripts - - name: Mark repo as safe directory - run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER }}/pulumi-${{ env.PROVIDER }} - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags - - name: Install Go - uses: actions/setup-go@v3 - with: - go-version: 1.20.1 - - 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 - - run: cd sdk/go/http && golangci-lint run -c ../../../.golangci.yml - - if: failure() && github.event_name == 'push' - name: Notify Slack - uses: 8398a7/action-slack@v3 - with: - author_name: Failure in linting go sdk - fields: repo,commit,author,action - status: ${{ job.status }} prerequisites: name: prerequisites runs-on: ubuntu-latest @@ -321,7 +239,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Publish SDKs - uses: pulumi/pulumi-package-publisher@v0.0.7 + uses: pulumi/pulumi-package-publisher@v0.0.9 - env: SLACK_CHANNEL: provider-upgrade-publish-status SLACK_COLOR: "#FF0000" diff --git a/.github/workflows/resync-build.yml b/.github/workflows/resync-build.yml index 8c9aaec..b4a023a 100644 --- a/.github/workflows/resync-build.yml +++ b/.github/workflows/resync-build.yml @@ -1,7 +1,7 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: "http" + PROVIDER: http PULUMI_EXTRA_MAPPING_ERROR: true PULUMI_MISSING_MAPPING_ERROR: true DOTNETVERSION: | @@ -9,6 +9,7 @@ env: 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GOVERSION: 1.20.1 + HTTP_TOKEN: ${{ secrets.HTTP_TOKEN }} JAVAVERSION: "11" NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} NODEVERSION: 16.x diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index c4dd2f1..41eb357 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -1,13 +1,14 @@ # WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt env: - PROVIDER: "http" + PROVIDER: http PR_COMMIT_SHA: ${{ github.event.client_payload.pull_request.head.sha }} DOTNETVERSION: | 6.0.x 3.1.301 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GOVERSION: 1.20.1 + HTTP_TOKEN: ${{ secrets.HTTP_TOKEN }} JAVAVERSION: "11" NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} NODEVERSION: 16.x @@ -108,6 +109,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 @@ -139,83 +141,6 @@ jobs: issue-number: ${{ github.event.client_payload.github.payload.issue.number }} repository: ${{ github.event.client_payload.github.payload.repository.full_name }} token: ${{ secrets.PULUMI_BOT_TOKEN }} - lint: - container: golangci/golangci-lint:v1.51 - if: github.event_name == 'repository_dispatch' || - github.event.pull_request.head.repo.full_name == github.repository - name: lint - runs-on: ubuntu-latest - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - with: - ref: ${{ env.PR_COMMIT_SHA }} - - name: Checkout Scripts Repo - uses: actions/checkout@v3 - with: - path: ci-scripts - repository: pulumi/scripts - - name: Mark repo as safe directory - run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER }}/pulumi-${{ env.PROVIDER }} - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags - - name: Install Go - uses: actions/setup-go@v3 - with: - go-version: 1.20.1 - - 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 - - run: make lint_provider - - if: failure() && github.event_name == 'push' - name: Notify Slack - uses: 8398a7/action-slack@v3 - with: - author_name: Failure in linting provider - fields: repo,commit,author,action - status: ${{ job.status }} - lint_sdk: - container: golangci/golangci-lint:v1.51 - if: github.event_name == 'repository_dispatch' || - github.event.pull_request.head.repo.full_name == github.repository - name: lint-sdk - needs: build_sdk - runs-on: ubuntu-latest - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - with: - ref: ${{ env.PR_COMMIT_SHA }} - - name: Checkout Scripts Repo - uses: actions/checkout@v3 - with: - path: ci-scripts - repository: pulumi/scripts - - name: Mark repo as safe directory - run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER }}/pulumi-${{ env.PROVIDER }} - - name: Unshallow clone for tags - run: git fetch --prune --unshallow --tags - - name: Install Go - uses: actions/setup-go@v3 - with: - go-version: 1.20.1 - - 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 - - run: cd sdk/go/http && golangci-lint run -c ../../../.golangci.yml - - if: failure() && github.event_name == 'push' - name: Notify Slack - uses: 8398a7/action-slack@v3 - with: - author_name: Failure in linting go sdk - fields: repo,commit,author,action - status: ${{ job.status }} prerequisites: if: github.event_name == 'repository_dispatch' || github.event.pull_request.head.repo.full_name == github.repository @@ -283,6 +208,7 @@ jobs: with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin/provider.tar.gz + retention-days: 30 - if: failure() && github.event_name == 'push' name: Notify Slack uses: 8398a7/action-slack@v3 @@ -296,8 +222,6 @@ jobs: name: sentinel needs: - test - - lint - - lint_sdk runs-on: ubuntu-latest steps: - name: Is workflow a success diff --git a/.goreleaser.prerelease.yml b/.goreleaser.prerelease.yml index c1f9903..9d3624b 100644 --- a/.goreleaser.prerelease.yml +++ b/.goreleaser.prerelease.yml @@ -26,6 +26,10 @@ builds: - darwin - windows - linux + hooks: + post: + - env GOOS={{ .Os }} GOARCH={{ .Arch }} go clean -cache + - env GOOS={{ .Os }} GOARCH={{ .Arch }} go clean -modcache ignore: [] ldflags: - -X github.com/pulumi/pulumi-http/provider/pkg/version.Version={{.Tag}} diff --git a/.goreleaser.yml b/.goreleaser.yml index ed6926e..fa86fba 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -26,6 +26,10 @@ builds: - darwin - windows - linux + hooks: + post: + - env GOOS={{ .Os }} GOARCH={{ .Arch }} go clean -cache + - env GOOS={{ .Os }} GOARCH={{ .Arch }} go clean -modcache ignore: [] ldflags: - -X github.com/pulumi/pulumi-http/provider/pkg/version.Version={{.Tag}} diff --git a/.upgrade-config.yml b/.upgrade-config.yml index 7e8a6b7..f9510b1 100644 --- a/.upgrade-config.yml +++ b/.upgrade-config.yml @@ -4,5 +4,5 @@ upstream-provider-name: terraform-provider-http pulumi-infer-version: true remove-plugins: true -pr-reviewers: pulumi/Ecosystem +pr-reviewers: pulumi/Providers diff --git a/Makefile b/Makefile index e60e42e..2761141 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ TFGEN := pulumi-tfgen-$(PACK) PROVIDER := pulumi-resource-$(PACK) VERSION := $(shell pulumictl get version) JAVA_GEN := pulumi-java-gen -JAVA_GEN_VERSION := v0.9.4 +JAVA_GEN_VERSION := v0.5.4 TESTPARALLELISM := 10 WORKING_DIR := $(shell pwd) diff --git a/scripts/upstream.sh b/scripts/upstream.sh index cd35466..7c1933f 100644 --- a/scripts/upstream.sh +++ b/scripts/upstream.sh @@ -89,20 +89,15 @@ start_rebase() { git checkout -B pulumi-patch "${FROM}" git branch --set-upstream-to=local pulumi-patch - if [ -d ../patches ]; then - for patch in ../patches/*.patch; do - echo "Applying $patch" - if ! git apply --3way "$patch"; then - echo - echo "Failed to apply patch. Please run 'make upstream.rebase FROM=$TAG' where '$TAG' allows the patch set to apply cleanly" - echo - exit 1 - fi - patch=${patch#../patches/*-} - git commit -am "${patch%.patch}" - done - fi - + for patch in ../patches/*.patch; do + echo "Applying $patch" + if ! git am --3way "$patch"; then + echo + echo "Failed to apply patch. Please run 'make upstream.rebase FROM=$TAG' where '$TAG' allows the patch set to apply cleanly" + echo + exit 1 + fi + done touch ../rebase-in-progress