From 879493ab8f5a38000832feb512184991aeae6593 Mon Sep 17 00:00:00 2001 From: Ringo De Smet Date: Mon, 25 Nov 2024 10:53:31 +0100 Subject: [PATCH] Reapplied pulumi/ci-mgmt --- .ci-mgmt.yaml | 2 -- .github/workflows/license.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/main.yml | 2 +- .github/workflows/prerelease.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/pull-request.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/resync-build.yml | 2 +- .github/workflows/run-acceptance-tests.yml | 2 +- .github/workflows/upgrade-bridge.yml | 2 +- .github/workflows/upgrade-provider.yml | 12 ++++++++++-- .golangci.yml | 2 +- Makefile | 12 +++++------- upstream.sh | 2 +- 15 files changed, 27 insertions(+), 23 deletions(-) diff --git a/.ci-mgmt.yaml b/.ci-mgmt.yaml index 0a12f22..9ed0fa4 100644 --- a/.ci-mgmt.yaml +++ b/.ci-mgmt.yaml @@ -5,7 +5,6 @@ major-version: 0 providerDefaultBranch: main upstreamProviderOrg: vancluever publishRegistry: false -enableAutoRelease: false plugins: - name: terraform version: "1.0.19" @@ -22,5 +21,4 @@ license: ignore: # Package is licensed under Apache 2.0 but license is not picked up correctly by the license detector - github.com/OpenDNS/vegadns2client -pr-assign: ringods pulumiConvert: 1 diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index 83f8357..1e8c462 100644 --- a/.github/workflows/license.yml +++ b/.github/workflows/license.yml @@ -1,4 +1,4 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt +# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt name: license_check diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 988e3b2..8f58bec 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,4 +1,4 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt +# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt name: lint diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fe3d378..e51fb11 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,4 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt +# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index b561ef3..07a7a7c 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -1,4 +1,4 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt +# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt env: IS_PRERELEASE: true diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e482ca4..307d3f5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,4 +1,4 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt +# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt name: Publish on: diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index beb84a8..1f209a8 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -1,4 +1,4 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt +# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aa6276f..173db15 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt +# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt name: release on: push: diff --git a/.github/workflows/resync-build.yml b/.github/workflows/resync-build.yml index 1e09404..14b2f0c 100644 --- a/.github/workflows/resync-build.yml +++ b/.github/workflows/resync-build.yml @@ -1,4 +1,4 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt +# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt env: PULUMI_EXTRA_MAPPING_ERROR: true diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index eacde30..8a5f45d 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -1,4 +1,4 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt +# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt name: run-acceptance-tests diff --git a/.github/workflows/upgrade-bridge.yml b/.github/workflows/upgrade-bridge.yml index a7f796b..165ed0b 100644 --- a/.github/workflows/upgrade-bridge.yml +++ b/.github/workflows/upgrade-bridge.yml @@ -1,4 +1,4 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt +# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt name: Upgrade bridge on: diff --git a/.github/workflows/upgrade-provider.yml b/.github/workflows/upgrade-provider.yml index a2a646c..2ad5981 100644 --- a/.github/workflows/upgrade-provider.yml +++ b/.github/workflows/upgrade-provider.yml @@ -1,4 +1,4 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt +# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt name: Upgrade provider on: @@ -11,6 +11,13 @@ on: If no version is specified, it will be inferred from the upstream provider's release tags. required: false type: string + upgradeProviderVersion: + description: | + Version of upgrade-provider to use. This must be a valid git reference in the pulumi/upgrade-provider repo. Defaults to "main" + + See https://go.dev/ref/mod#versions for valid versions. E.g. "v0.1.0", "main", "da25dec". + default: main + type: string schedule: # 3 AM UTC ~ 8 PM PDT / 7 PM PST daily. Time chosen to run during off hours. - cron: 0 3 * * * @@ -39,7 +46,7 @@ jobs: with: tools: pulumictl, pulumicli, dotnet, go, nodejs, python - name: Install upgrade-provider - run: go install github.com/pulumi/upgrade-provider@main + run: go install github.com/pulumi/upgrade-provider@${{ inputs.upgradeProviderVersion || 'main' }} shell: bash - name: "Set up git identity" run: | @@ -74,3 +81,4 @@ jobs: run: | issue_number=$(gh issue list --search "pulumiupgradeproviderissue" --repo "${{ github.repository }}" --json=number --jq=".[0].number") gh issue comment "${issue_number}" --repo "${{ github.repository }}" --body "Failed to create automatic PR: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}/" + diff --git a/.golangci.yml b/.golangci.yml index 37df19a..bb49b2a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,4 +1,4 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt +# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt linters: enable: diff --git a/Makefile b/Makefile index 236b052..2d91fc3 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt +# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt PACK := acme ORG := pulumiverse @@ -20,10 +20,12 @@ PROVIDER_VERSION ?= 0.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)") +# Strips debug information from the provider binary to reduce its size and speed up builds +LDFLAGS_STRIP_SYMBOLS=-s -w LDFLAGS_PROJ_VERSION=-X $(PROJECT)/$(VERSION_PATH)=$(VERSION_GENERIC) LDFLAGS_UPSTREAM_VERSION= LDFLAGS_EXTRAS= -LDFLAGS=$(LDFLAGS_PROJ_VERSION) $(LDFLAGS_UPSTREAM_VERSION) $(LDFLAGS_EXTRAS) +LDFLAGS=$(LDFLAGS_PROJ_VERSION) $(LDFLAGS_UPSTREAM_VERSION) $(LDFLAGS_EXTRAS) $(LDFLAGS_STRIP_SYMBOLS) development: install_plugins provider build_sdks install_sdks @@ -175,11 +177,7 @@ bin/pulumi-java-gen: .pulumi-java-gen.version # - Run make ci-mgmt to apply the change locally. # ci-mgmt: .ci-mgmt.yaml - go run github.com/pulumi/ci-mgmt/provider-ci@master generate \ - --name $(ORG)/pulumi-$(PACK) \ - --out . \ - --template external-bridged-provider \ - --config $< + go run github.com/pulumi/ci-mgmt/provider-ci@master generate # Because some codegen depends on the version of the CLI used, we install a local CLI # version pinned to the same version as `provider/go.mod`. diff --git a/upstream.sh b/upstream.sh index f5609ac..87593cd 100755 --- a/upstream.sh +++ b/upstream.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt +# WARNING: This file is autogenerated - changes will be overwritten when regenerated by https://github.com/pulumi/ci-mgmt set -e