From 5afb0cce7491844387acc1745a6960b094734753 Mon Sep 17 00:00:00 2001 From: Anton Tayanovskyy Date: Wed, 18 Sep 2024 16:29:25 -0400 Subject: [PATCH] Do not delete provider custom workflows in make ci-mgmt (#1068) We introduced a notion of provider-custom workflow files, such as: aws-upstream-tests.yml Currently CI knows to not delete them, but `make ci-mgmt` target still does. This PR fixes this so that `make ci-mgmt` target matches the behavior of CI workflows. --- provider-ci/internal/pkg/templates/bridged-provider/Makefile | 2 +- provider-ci/test-providers/acme/Makefile | 2 +- provider-ci/test-providers/aws/Makefile | 2 +- provider-ci/test-providers/cloudflare/Makefile | 2 +- provider-ci/test-providers/docker/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/provider-ci/internal/pkg/templates/bridged-provider/Makefile b/provider-ci/internal/pkg/templates/bridged-provider/Makefile index 1020c78e7..71dad4225 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/Makefile +++ b/provider-ci/internal/pkg/templates/bridged-provider/Makefile @@ -208,7 +208,7 @@ bin/pulumi-java-gen: .pulumi-java-gen.version # - Run make ci-mgmt to apply the change locally. # ci-mgmt: .ci-mgmt.yaml - rm -f .github/workflows/*.yml # Copied from update-workflows.yml + find .github/workflows/*.yml -type f ! -name "$(PACK)*.yml" -delete go run github.com/pulumi/ci-mgmt/provider-ci@master generate \ --name $(ORG)/pulumi-$(PACK) \ --out . \ diff --git a/provider-ci/test-providers/acme/Makefile b/provider-ci/test-providers/acme/Makefile index bbfdc4cd6..cf99d65d9 100644 --- a/provider-ci/test-providers/acme/Makefile +++ b/provider-ci/test-providers/acme/Makefile @@ -174,7 +174,7 @@ bin/pulumi-java-gen: .pulumi-java-gen.version # - Run make ci-mgmt to apply the change locally. # ci-mgmt: .ci-mgmt.yaml - rm -f .github/workflows/*.yml # Copied from update-workflows.yml + find .github/workflows/*.yml -type f ! -name "$(PACK)*.yml" -delete go run github.com/pulumi/ci-mgmt/provider-ci@master generate \ --name $(ORG)/pulumi-$(PACK) \ --out . \ diff --git a/provider-ci/test-providers/aws/Makefile b/provider-ci/test-providers/aws/Makefile index f7c3390e5..b0d4f2753 100644 --- a/provider-ci/test-providers/aws/Makefile +++ b/provider-ci/test-providers/aws/Makefile @@ -189,7 +189,7 @@ bin/pulumi-java-gen: .pulumi-java-gen.version # - Run make ci-mgmt to apply the change locally. # ci-mgmt: .ci-mgmt.yaml - rm -f .github/workflows/*.yml # Copied from update-workflows.yml + find .github/workflows/*.yml -type f ! -name "$(PACK)*.yml" -delete go run github.com/pulumi/ci-mgmt/provider-ci@master generate \ --name $(ORG)/pulumi-$(PACK) \ --out . \ diff --git a/provider-ci/test-providers/cloudflare/Makefile b/provider-ci/test-providers/cloudflare/Makefile index 82ca45585..54fcd9c33 100644 --- a/provider-ci/test-providers/cloudflare/Makefile +++ b/provider-ci/test-providers/cloudflare/Makefile @@ -178,7 +178,7 @@ bin/pulumi-java-gen: .pulumi-java-gen.version # - Run make ci-mgmt to apply the change locally. # ci-mgmt: .ci-mgmt.yaml - rm -f .github/workflows/*.yml # Copied from update-workflows.yml + find .github/workflows/*.yml -type f ! -name "$(PACK)*.yml" -delete go run github.com/pulumi/ci-mgmt/provider-ci@master generate \ --name $(ORG)/pulumi-$(PACK) \ --out . \ diff --git a/provider-ci/test-providers/docker/Makefile b/provider-ci/test-providers/docker/Makefile index b570707ba..d4217ff4e 100644 --- a/provider-ci/test-providers/docker/Makefile +++ b/provider-ci/test-providers/docker/Makefile @@ -179,7 +179,7 @@ bin/pulumi-java-gen: .pulumi-java-gen.version # - Run make ci-mgmt to apply the change locally. # ci-mgmt: .ci-mgmt.yaml - rm -f .github/workflows/*.yml # Copied from update-workflows.yml + find .github/workflows/*.yml -type f ! -name "$(PACK)*.yml" -delete go run github.com/pulumi/ci-mgmt/provider-ci@master generate \ --name $(ORG)/pulumi-$(PACK) \ --out . \