Update GitHub Actions workflows. (#604)

This PR was automatically generated by the
update-workflows-ecosystem-providers workflow in the pulumi/ci-mgmt
repo, from commit 52a4a4ba4be7dfa9128b136bbec1df4bfda8b5d3.

.github/workflows/prerequisites.yml

@@ -51,6 +51,7 @@ jobs:
     - uses: pulumi/provider-version-action@f96d032a2758fdda7939e5728eff6c0d980ae894 # v1.6.0
       id: provider-version
       with:
+        major-version: 3
         set-env: 'PROVIDER_VERSION'
     - name: Cache examples generation
       uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4

.github/workflows/publish.yml

@@ -76,6 +76,14 @@ jobs:
         path: dist
         # Don't create a directory for each artifact
         merge-multiple: true
+    - name: Download schema
+      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: dist
     - name: Calculate checksums
       working-directory: dist
       run: shasum ./*.tar.gz > "pulumi-consul_${{ inputs.version }}_checksums.txt"

Makefile

@@ -270,11 +270,9 @@ bin/$(CODEGEN): provider/*.go provider/go.* .make/upstream
 
 # Apply patches to the upstream submodule, if it exists
 upstream: .make/upstream
-# Re-run if the upstream commit or the patches change
-.make/upstream: $(wildcard patches/*) $(shell ./upstream.sh file_target)
-ifneq ("$(wildcard upstream)","")
-	./upstream.sh init
-endif
+# Re-run if the upstream commit or the patches change.
+.make/upstream: $(wildcard patches/*) $(shell ./scripts/upstream.sh file_target)
+	./scripts/upstream.sh init
 	@touch $@
 .PHONY: upstream
 

upstream.sh → scripts/upstream.sh

@@ -182,7 +182,10 @@ init() {
     esac
   done
 
-  assert_upstream_exists
+  if [[ ! -d upstream ]]; then
+    echo "No 'upstream' directory detected. Skipping init."
+    exit 0
+  fi
 
   if [[ "${force}" != "true" ]]; then
     assert_not_checked_out