From 40f6e7aaea44c1f69b6cd6af682cdc1869260e7b Mon Sep 17 00:00:00 2001 From: Pulumi Bot Date: Tue, 9 Jul 2024 07:48:58 +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 bebe838a..fdfb8011 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-xyz/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 1b1f1d4e..21453b53 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -80,6 +80,7 @@ jobs: github.event.pull_request.head.repo.full_name == github.repository needs: - test + - build_provider - license_check - lint runs-on: ubuntu-latest diff --git a/Makefile b/Makefile index 02f26dc0..dce3d877 100644 --- a/Makefile +++ b/Makefile @@ -213,7 +213,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 && \