Skip to content

Commit

Permalink
Add default checkUpstreamUpgrade flag (#1124)
Browse files Browse the repository at this point in the history
This flag controls whether we generate the upgrade-provider Workflow.
Some providers cannot currently be upgraded automatically, either
because they are archived upstream, or because their licensing conflicts
with ours.

Followup for some logic that was lost in
#1110.
  • Loading branch information
guineveresaenger authored Nov 4, 2024
1 parent 1e9bbf1 commit 63a38f3
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 63 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#{{ if .Config.checkUpstreamUpgrade -}}#
# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt

name: Upgrade provider
Expand Down Expand Up @@ -71,3 +72,4 @@ jobs:
if: steps.target_version.outputs.version != ''
run: upgrade-provider "${{ github.repository }}" --kind="all" --target-version="${{ steps.target_version.outputs.version }}" #{{ if .Config.javaGenVersion }}#--java-version="#{{ .Config.javaGenVersion }}#"#{{ end }}#
shell: bash
#{{ end }}#
6 changes: 5 additions & 1 deletion provider-ci/internal/pkg/templates/defaults.config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,10 @@ publish:
# Enables automatic registry index doc file generation. Intended for use with Tier 2/3 providers.
registryDocs: false

# checkUpstreamUpgrade determines whether we run the upstream upgrade job for bridged providers.
# Set to false for providers that cannot be upgraded, e.g. because of archived upstream or a license conflict.
checkUpstreamUpgrade: true

# Set a path for each language example to enable the test
# releaseVerification:
# nodejs: examples/simple-nodejs
Expand Down Expand Up @@ -254,4 +258,4 @@ registryDocs: false
# # but do say mention (in README.md) that they are under Apache-2.0."
# - github.com/alibabacloud-go/endpoint-util/service
# - github.com/alibabacloud-go/tea-roa-utils/service
# - github.com/alibabacloud-go/tea-roa/client
# - github.com/alibabacloud-go/tea-roa/client
3 changes: 2 additions & 1 deletion provider-ci/test-providers/cloudflare/.ci-mgmt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ actions:
run: |
cd provider && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt
pulumiConvert: 1
registryDocs: true
registryDocs: true
checkUpstreamUpgrade: false

This file was deleted.

0 comments on commit 63a38f3

Please sign in to comment.