From 4dedb147f75c024acb743a11a6221c618a2ca8a5 Mon Sep 17 00:00:00 2001 From: Daniel Bradley Date: Wed, 26 Jun 2024 19:12:28 +0100 Subject: [PATCH] Inline worktreeAllowedChanges (#1005) This is not needed to be overridden now the rollout is complete. Only use of override is also no longer needed: https://github.com/search?q=org%3Apulumi+path%3A.ci-mgmt.yaml+%22worktreeAllowedChanges%3A%22&type=code PR to remove dangling use: https://github.com/pulumi/pulumi-kafka/pull/459 --- .../internal/pkg/templates/bridged-provider.config.yaml | 9 --------- .../bridged-provider/.github/workflows/build_sdk.yml | 8 +++++--- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/provider-ci/internal/pkg/templates/bridged-provider.config.yaml b/provider-ci/internal/pkg/templates/bridged-provider.config.yaml index 6b61a1816..069b0a84a 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider.config.yaml +++ b/provider-ci/internal/pkg/templates/bridged-provider.config.yaml @@ -164,15 +164,6 @@ publish: path: sdk additive: false -# worktreeAllowedChanges defines which files we expect to find changes in when building in CI with a different version number -# This could be in-lined as is not needed to be overridden: https://github.com/search?q=org%3Apulumi+path%3A.ci-mgmt.yaml+%22worktreeAllowedChanges%3A%22&type=code -worktreeAllowedChanges: |- - sdk/**/pulumi-plugin.json - sdk/dotnet/Pulumi.*.csproj - sdk/go/**/pulumiUtilities.go - sdk/nodejs/package.json - sdk/python/pyproject.toml - # Set a path for each language example to enable the test # releaseVerification: # nodejs: examples/simple-nodejs diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/build_sdk.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/build_sdk.yml index 008d5fafc..18f965867 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/build_sdk.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/build_sdk.yml @@ -60,11 +60,13 @@ jobs: run: make build_${{ matrix.language }} - name: Check worktree clean uses: pulumi/git-status-check-action@v1 -#{{- if .Config.worktreeAllowedChanges }}# with: allowed-changes: | -#{{ .Config.worktreeAllowedChanges | indent 12 }}# -#{{- end }}# + sdk/**/pulumi-plugin.json + sdk/dotnet/Pulumi.*.csproj + sdk/go/**/pulumiUtilities.go + sdk/nodejs/package.json + sdk/python/pyproject.toml - name: Compress SDK folder run: tar -zcf sdk/${{ matrix.language }}.tar.gz -C sdk/${{ matrix.language }} . - name: Upload artifacts