diff --git a/provider-ci/internal/pkg/generate.go b/provider-ci/internal/pkg/generate.go index b8ed32a32..566ae68d3 100644 --- a/provider-ci/internal/pkg/generate.go +++ b/provider-ci/internal/pkg/generate.go @@ -80,6 +80,8 @@ func getDeletedFiles(templateName string) []string { case "bridged-provider": return []string{ "scripts/upstream.sh", + ".goreleaser.yml", + ".goreleaser.prerelease.yml", } default: return nil diff --git a/provider-ci/internal/pkg/templates/bridged-provider.config.yaml b/provider-ci/internal/pkg/templates/bridged-provider.config.yaml index cdc5dfff0..340892afd 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider.config.yaml +++ b/provider-ci/internal/pkg/templates/bridged-provider.config.yaml @@ -5,7 +5,7 @@ # organization is the name of the Github organization the repository lives in. Defaults to 'pulumi' organization: pulumi -# major version of the current provider - used in make files and goreleaser +# major version of the current provider - used in make files # This should always be set by all providers as this is key to go module paths. major-version: 2 @@ -32,12 +32,6 @@ major-version: 2 # Only set for 5 providers: https://github.com/search?q=org%3Apulumi+path%3A.ci-mgmt.yaml+%22upstream-provider-repo%22&type=code #upstream-provider-repo: terraform-provider-xyz -# parallel sets goreleaser's -p argument -parallel: 3 - -# timeout sets goreleaser's timeout during any kind of release -timeout: 60 - # lint includes an extra lint job in workflows if enabled (default). Can be set explicit to false. # This is false in around 8 provider repos: https://github.com/search?q=org%3Apulumi+path%3A.ci-mgmt.yaml+%22lint%3A+false%22&type=code lint: true @@ -156,7 +150,6 @@ actionVersions: configureAwsCredentials: aws-actions/configure-aws-credentials@v4 setupGcloud: google-github-actions/setup-gcloud@v2 googleAuth: google-github-actions/auth@v2 - goReleaser: goreleaser/goreleaser-action@v5 checkout: actions/checkout@v4 downloadArtifact: actions/download-artifact@v4 pathsFilter: dorny/paths-filter@v2 @@ -182,15 +175,7 @@ publish: # dotnet: examples/simple-dotnet # go: exampels/simple-go -# Go releaser: skip the post cleaning steps -# Only used for gcp: https://github.com/search?q=org%3Apulumi+path%3A.ci-mgmt.yaml+%22skipGoReleaserHooks%3A%22&type=code -#skipGoReleaserHooks: false - -# Go releaser: add ignore for arm64 windows. -# Only used for minio: https://github.com/search?q=org%3Apulumi+path%3A.ci-mgmt.yaml+%22skipWindowsArmBuild%3A%22&type=code -#skipWindowsArmBuild: false - -# List of extra flags used only in goreleaser. +# List of extra flags used in Makefile. # Only used by newrelic: https://github.com/search?q=org%3Apulumi+path%3A.ci-mgmt.yaml+%22extra-ld-flags%22&type=code #extra-ld-flags: # - "-X github.com/newrelic/terraform-provider-newrelic/v2/main.UserAgentServiceName=pulumi" diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.goreleaser.prerelease.yml b/provider-ci/internal/pkg/templates/bridged-provider/.goreleaser.prerelease.yml deleted file mode 100644 index 41844f18a..000000000 --- a/provider-ci/internal/pkg/templates/bridged-provider/.goreleaser.prerelease.yml +++ /dev/null @@ -1,62 +0,0 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt - -archives: -- id: archive - name_template: "{{ .Binary }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}" -before: - hooks: - - make tfgen -blobs: -- bucket: get.pulumi.com - folder: releases/plugins/ - ids: - - archive - provider: s3 - region: us-west-2 -builds: -- binary: pulumi-resource-#{{ .Config.provider }}# - dir: provider - env: - - CGO_ENABLED=0 - - GO111MODULE=on - goarch: - - amd64 - - arm64 - goos: - - darwin - - windows - - linux - #{{- if .Config.skipGoReleaserHooks }}# - #{{- else }}# - hooks: - post: - - env GOOS={{ .Os }} GOARCH={{ .Arch }} go clean -cache - - env GOOS={{ .Os }} GOARCH={{ .Arch }} go clean -modcache - #{{- end }}# - #{{- if .Config.skipWindowsArmBuild }}# - ignore: - - goarch: arm64 - goos: windows - #{{- else }}# - ignore: [] - #{{- end }}# - ldflags: - #{{- if ge (index .Config "major-version") 2 }}# - - -X github.com/#{{ .Repository }}#/provider/v#{{ index .Config "major-version" }}#/pkg/version.Version={{.Tag}} - #{{- else }}# - - -X github.com/#{{ .Repository }}#/provider/pkg/version.Version={{.Tag}} - #{{- end }}# - #{{- if .Config.providerVersion }}# - - -X #{{ .Config.providerVersion }}#={{.Tag}} - #{{- end }}# - #{{- range (index .Config "extra-ld-flags") }}# - - #{{ . }}# - #{{- end }}# - main: ./cmd/pulumi-resource-#{{ .Config.provider }}#/ -changelog: - skip: true -release: - disable: true -snapshot: - name_template: "{{ .Tag }}-SNAPSHOT" -project_name: "#{{ .ProjectName }}#" diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.goreleaser.yml b/provider-ci/internal/pkg/templates/bridged-provider/.goreleaser.yml deleted file mode 100644 index 94e33c466..000000000 --- a/provider-ci/internal/pkg/templates/bridged-provider/.goreleaser.yml +++ /dev/null @@ -1,71 +0,0 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt - -archives: -- id: archive - name_template: "{{ .Binary }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}" -before: - hooks: - - make tfgen -blobs: -- bucket: get.pulumi.com - folder: releases/plugins/ - ids: - - archive - provider: s3 - region: us-west-2 -builds: -- binary: pulumi-resource-#{{ .Config.provider }}# - dir: provider - env: - - CGO_ENABLED=0 - - GO111MODULE=on - goarch: - - amd64 - - arm64 - goos: - - darwin - - windows - - linux - #{{- if .Config.skipGoReleaserHooks }}# - #{{- else }}# - hooks: - post: - - env GOOS={{ .Os }} GOARCH={{ .Arch }} go clean -cache - - env GOOS={{ .Os }} GOARCH={{ .Arch }} go clean -modcache - #{{- end }}# - #{{- if .Config.skipWindowsArmBuild }}# - ignore: - - goarch: arm64 - goos: windows - #{{- else }}# - ignore: [] - #{{- end }}# - ldflags: - #{{- if ge (index .Config "major-version") 2 }}# - - -X#{{if (gt (len .Repository) 22)}}##{{ "\n " }}##{{end}}# github.com/#{{ .Repository }}#/provider/v#{{ index .Config "major-version" }}#/pkg/version.Version={{.Tag}} - #{{- else }}# - - -X#{{if (gt (len .Repository) 24)}}##{{ "\n " }}##{{end}}# github.com/#{{ .Repository }}#/provider/pkg/version.Version={{.Tag}} - #{{- end }}# - #{{- if .Config.providerVersion }}# - - -X - #{{ .Config.providerVersion }}#={{.Tag}} - #{{- end }}# - #{{- range (index .Config "extra-ld-flags") }}# - - #{{ . }}# - #{{- end }}# - main: ./cmd/pulumi-resource-#{{ .Config.provider }}#/ -changelog: - filters: - exclude: - - Merge branch - - Merge pull request - - \Winternal\W - - \Wci\W - - \Wchore\W - sort: asc - use: git -release: - disable: false -snapshot: - name_template: "{{ .Tag }}-SNAPSHOT" -project_name: "#{{ .ProjectName }}#" diff --git a/provider-ci/test-providers/aws/.goreleaser.prerelease.yml b/provider-ci/test-providers/aws/.goreleaser.prerelease.yml deleted file mode 100644 index ed79f5fac..000000000 --- a/provider-ci/test-providers/aws/.goreleaser.prerelease.yml +++ /dev/null @@ -1,44 +0,0 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt - -archives: -- id: archive - name_template: "{{ .Binary }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}" -before: - hooks: - - make tfgen -blobs: -- bucket: get.pulumi.com - folder: releases/plugins/ - ids: - - archive - provider: s3 - region: us-west-2 -builds: -- binary: pulumi-resource-aws - dir: provider - env: - - CGO_ENABLED=0 - - GO111MODULE=on - goarch: - - amd64 - - arm64 - goos: - - 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-aws/provider/v6/pkg/version.Version={{.Tag}} - - -X github.com/hashicorp/terraform-provider-aws/version.ProviderVersion={{.Tag}} - main: ./cmd/pulumi-resource-aws/ -changelog: - skip: true -release: - disable: true -snapshot: - name_template: "{{ .Tag }}-SNAPSHOT" -project_name: "pulumi-aws" diff --git a/provider-ci/test-providers/aws/.goreleaser.yml b/provider-ci/test-providers/aws/.goreleaser.yml deleted file mode 100644 index e7b6747f1..000000000 --- a/provider-ci/test-providers/aws/.goreleaser.yml +++ /dev/null @@ -1,53 +0,0 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt - -archives: -- id: archive - name_template: "{{ .Binary }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}" -before: - hooks: - - make tfgen -blobs: -- bucket: get.pulumi.com - folder: releases/plugins/ - ids: - - archive - provider: s3 - region: us-west-2 -builds: -- binary: pulumi-resource-aws - dir: provider - env: - - CGO_ENABLED=0 - - GO111MODULE=on - goarch: - - amd64 - - arm64 - goos: - - 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-aws/provider/v6/pkg/version.Version={{.Tag}} - - -X - github.com/hashicorp/terraform-provider-aws/version.ProviderVersion={{.Tag}} - main: ./cmd/pulumi-resource-aws/ -changelog: - filters: - exclude: - - Merge branch - - Merge pull request - - \Winternal\W - - \Wci\W - - \Wchore\W - sort: asc - use: git -release: - disable: false -snapshot: - name_template: "{{ .Tag }}-SNAPSHOT" -project_name: "pulumi-aws" diff --git a/provider-ci/test-providers/cloudflare/.goreleaser.prerelease.yml b/provider-ci/test-providers/cloudflare/.goreleaser.prerelease.yml deleted file mode 100644 index 2d2f0408d..000000000 --- a/provider-ci/test-providers/cloudflare/.goreleaser.prerelease.yml +++ /dev/null @@ -1,43 +0,0 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt - -archives: -- id: archive - name_template: "{{ .Binary }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}" -before: - hooks: - - make tfgen -blobs: -- bucket: get.pulumi.com - folder: releases/plugins/ - ids: - - archive - provider: s3 - region: us-west-2 -builds: -- binary: pulumi-resource-cloudflare - dir: provider - env: - - CGO_ENABLED=0 - - GO111MODULE=on - goarch: - - amd64 - - arm64 - goos: - - 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-cloudflare/provider/v5/pkg/version.Version={{.Tag}} - main: ./cmd/pulumi-resource-cloudflare/ -changelog: - skip: true -release: - disable: true -snapshot: - name_template: "{{ .Tag }}-SNAPSHOT" -project_name: "pulumi-cloudflare" diff --git a/provider-ci/test-providers/cloudflare/.goreleaser.yml b/provider-ci/test-providers/cloudflare/.goreleaser.yml deleted file mode 100644 index 21c87c961..000000000 --- a/provider-ci/test-providers/cloudflare/.goreleaser.yml +++ /dev/null @@ -1,52 +0,0 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt - -archives: -- id: archive - name_template: "{{ .Binary }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}" -before: - hooks: - - make tfgen -blobs: -- bucket: get.pulumi.com - folder: releases/plugins/ - ids: - - archive - provider: s3 - region: us-west-2 -builds: -- binary: pulumi-resource-cloudflare - dir: provider - env: - - CGO_ENABLED=0 - - GO111MODULE=on - goarch: - - amd64 - - arm64 - goos: - - 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-cloudflare/provider/v5/pkg/version.Version={{.Tag}} - main: ./cmd/pulumi-resource-cloudflare/ -changelog: - filters: - exclude: - - Merge branch - - Merge pull request - - \Winternal\W - - \Wci\W - - \Wchore\W - sort: asc - use: git -release: - disable: false -snapshot: - name_template: "{{ .Tag }}-SNAPSHOT" -project_name: "pulumi-cloudflare" diff --git a/provider-ci/test-providers/docker/.goreleaser.prerelease.yml b/provider-ci/test-providers/docker/.goreleaser.prerelease.yml deleted file mode 100644 index 09b8da9a4..000000000 --- a/provider-ci/test-providers/docker/.goreleaser.prerelease.yml +++ /dev/null @@ -1,43 +0,0 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt - -archives: -- id: archive - name_template: "{{ .Binary }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}" -before: - hooks: - - make tfgen -blobs: -- bucket: get.pulumi.com - folder: releases/plugins/ - ids: - - archive - provider: s3 - region: us-west-2 -builds: -- binary: pulumi-resource-docker - dir: provider - env: - - CGO_ENABLED=0 - - GO111MODULE=on - goarch: - - amd64 - - arm64 - goos: - - 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-docker/provider/v4/pkg/version.Version={{.Tag}} - main: ./cmd/pulumi-resource-docker/ -changelog: - skip: true -release: - disable: true -snapshot: - name_template: "{{ .Tag }}-SNAPSHOT" -project_name: "pulumi-docker" diff --git a/provider-ci/test-providers/docker/.goreleaser.yml b/provider-ci/test-providers/docker/.goreleaser.yml deleted file mode 100644 index d43b53885..000000000 --- a/provider-ci/test-providers/docker/.goreleaser.yml +++ /dev/null @@ -1,51 +0,0 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt - -archives: -- id: archive - name_template: "{{ .Binary }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}" -before: - hooks: - - make tfgen -blobs: -- bucket: get.pulumi.com - folder: releases/plugins/ - ids: - - archive - provider: s3 - region: us-west-2 -builds: -- binary: pulumi-resource-docker - dir: provider - env: - - CGO_ENABLED=0 - - GO111MODULE=on - goarch: - - amd64 - - arm64 - goos: - - 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-docker/provider/v4/pkg/version.Version={{.Tag}} - main: ./cmd/pulumi-resource-docker/ -changelog: - filters: - exclude: - - Merge branch - - Merge pull request - - \Winternal\W - - \Wci\W - - \Wchore\W - sort: asc - use: git -release: - disable: false -snapshot: - name_template: "{{ .Tag }}-SNAPSHOT" -project_name: "pulumi-docker"