From 7c24c958e2dc56565b49fff966b581a04b1adf25 Mon Sep 17 00:00:00 2001 From: Pulumi Bot Date: Wed, 22 Jan 2025 05:11:21 +0000 Subject: [PATCH] [internal] Update GitHub Actions workflow files --- .github/actions/setup-tools/action.yml | 2 +- .github/workflows/build_sdk.yml | 8 ++++++++ .github/workflows/lint.yml | 2 +- Makefile | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/actions/setup-tools/action.yml b/.github/actions/setup-tools/action.yml index 75b82a9a7..cb8267e95 100644 --- a/.github/actions/setup-tools/action.yml +++ b/.github/actions/setup-tools/action.yml @@ -26,7 +26,7 @@ runs: steps: - name: Install Go if: inputs.tools == 'all' || contains(inputs.tools, 'go') - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5 + uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5 with: go-version: "1.21.x" cache-dependency-path: | diff --git a/.github/workflows/build_sdk.yml b/.github/workflows/build_sdk.yml index 09a5a3992..30ce47c85 100644 --- a/.github/workflows/build_sdk.yml +++ b/.github/workflows/build_sdk.yml @@ -71,6 +71,14 @@ jobs: uses: ./.github/actions/download-codegen - name: Update path run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH" + - name: Download schema-embed.json + uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + with: + # 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-awsx - name: Restore makefile progress run: make --touch provider schema - name: Build SDK diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index b60147161..729b163b9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -41,7 +41,7 @@ jobs: with: persist-credentials: false - name: Install go - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5 + uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5 with: # The versions of golangci-lint and setup-go here cross-depend and need to update together. go-version: 1.23 diff --git a/Makefile b/Makefile index df829ba52..2c3fe672a 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ PULUMICTL_VERSION := v0.0.46 PULUMICTL := $(shell which pulumictl || \ (test ! -e $(WORKING_DIR)/bin/pulumictl && \ GOPATH="$(WORKING_DIR)" go install "github.com/pulumi/pulumictl/cmd/pulumictl@$(PULUMICTL_VERSION)"; \ - echo "$(WORKING_DIR)/bin/puluimctl")) + echo "$(WORKING_DIR)/bin/pulumictl")) # Override during CI using `make [TARGET] PROVIDER_VERSION=""` or by setting a PROVIDER_VERSION environment variable # Local & branch builds will just used this fixed default version unless specified