File tree Expand file tree Collapse file tree 4 files changed +16
-6
lines changed Expand file tree Collapse file tree 4 files changed +16
-6
lines changed Original file line number Diff line number Diff line change 5353 - uses : pulumi/provider-version-action@f96d032a2758fdda7939e5728eff6c0d980ae894 # v1.6.0
5454 id : provider-version
5555 with :
56+ major-version : 5
5657 set-env : ' PROVIDER_VERSION'
5758 - name : Cache examples generation
5859 uses : actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
Original file line number Diff line number Diff line change 7878 path : dist
7979 # Don't create a directory for each artifact
8080 merge-multiple : true
81+ - name : Download schema
82+ uses : actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
83+ with :
84+ # Use a pattern to avoid failing if the artifact doesn't exist
85+ pattern : schema-embed.*
86+ # Avoid creating directories for each artifact
87+ merge-multiple : true
88+ path : dist
8189 - name : Calculate checksums
8290 working-directory : dist
8391 run : shasum ./*.tar.gz > "pulumi-cloudflare_${{ inputs.version }}_checksums.txt"
Original file line number Diff line number Diff line change @@ -269,11 +269,9 @@ bin/$(CODEGEN): provider/*.go provider/go.* .make/upstream
269269
270270# Apply patches to the upstream submodule, if it exists
271271upstream : .make/upstream
272- # Re-run if the upstream commit or the patches change
273- .make/upstream : $(wildcard patches/* ) $(shell ./upstream.sh file_target)
274- ifneq ("$(wildcard upstream) ","")
275- ./upstream.sh init
276- endif
272+ # Re-run if the upstream commit or the patches change.
273+ .make/upstream : $(wildcard patches/* ) $(shell ./scripts/upstream.sh file_target)
274+ ./scripts/upstream.sh init
277275 @touch $@
278276.PHONY : upstream
279277
Original file line number Diff line number Diff line change @@ -182,7 +182,10 @@ init() {
182182 esac
183183 done
184184
185- assert_upstream_exists
185+ if [[ ! -d upstream ]]; then
186+ echo " No 'upstream' directory detected. Skipping init."
187+ exit 0
188+ fi
186189
187190 if [[ " ${force} " != " true" ]]; then
188191 assert_not_checked_out
You can’t perform that action at this time.
0 commit comments