From 9ef0276885497b4b97736a5a522d2f1e1f02124c Mon Sep 17 00:00:00 2001 From: Pulumi Bot Date: Tue, 9 Jul 2024 05:55:44 +0000 Subject: [PATCH] [internal] Update GitHub Actions workflow files --- .github/workflows/build_provider.yml | 5 ++++- .github/workflows/run-acceptance-tests.yml | 1 + Makefile | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_provider.yml b/.github/workflows/build_provider.yml index 076d9f1a..df68baaa 100644 --- a/.github/workflows/build_provider.yml +++ b/.github/workflows/build_provider.yml @@ -38,7 +38,10 @@ jobs: - name: Download schema-embed.json uses: actions/download-artifact@v4 with: - name: schema-embed.json + # Use a pattern to avoid failing if the artifact doesn't exist + pattern: schema-embed.* + # Avoid creating directories for each artifact + merge-multiple: true path: provider/cmd/pulumi-resource-confluentcloud/schema-embed.json - name: Prepare for build # This installs plugins and prepares upstream diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index eda1b563..6d4a9738 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -74,6 +74,7 @@ jobs: github.event.pull_request.head.repo.full_name == github.repository needs: - test + - build_provider - license_check runs-on: ubuntu-latest steps: diff --git a/Makefile b/Makefile index cc440438..746ca62e 100644 --- a/Makefile +++ b/Makefile @@ -212,7 +212,7 @@ bin/linux-arm64/$(PROVIDER): TARGET := linux-arm64 bin/darwin-amd64/$(PROVIDER): TARGET := darwin-amd64 bin/darwin-arm64/$(PROVIDER): TARGET := darwin-arm64 bin/windows-amd64/$(PROVIDER).exe: TARGET := windows-amd64 -bin/%/$(PROVIDER) bin/%/$(PROVIDER).exe: provider/cmd/$(PROVIDER)/schema-embed.json +bin/%/$(PROVIDER) bin/%/$(PROVIDER).exe: @# check the TARGET is set test $(TARGET) cd provider && \