Skip to content

Commit 4606e7a

Browse files
authored
Update GitHub Actions workflows. (#761)
This PR was automatically generated by the update-workflows-ecosystem-providers workflow in the pulumi/ci-mgmt repo, from commit 69cdf630f95816db18048cc72f880f443835ec0a.
1 parent 1fb7848 commit 4606e7a

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

.github/workflows/build_provider.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ on:
1919
{"os": "linux", "arch": "arm64"},
2020
{"os": "darwin", "arch": "amd64"},
2121
{"os": "darwin", "arch": "arm64"},
22-
{"os": "windows", "arch": "amd64"}
22+
{"os": "windows", "arch": "amd64"},
23+
{"os": "windows", "arch": "arm64"}
2324
]
2425
}
2526

scripts/crossbuild.mk

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,16 @@ bin/darwin-arm64/$(PROVIDER): GOOS := darwin
1919
bin/darwin-arm64/$(PROVIDER): GOARCH := arm64
2020
bin/windows-amd64/$(PROVIDER).exe: GOOS := windows
2121
bin/windows-amd64/$(PROVIDER).exe: GOARCH := amd64
22+
bin/windows-arm64/$(PROVIDER).exe: GOOS := windows
23+
bin/windows-arm64/$(PROVIDER).exe: GOARCH := arm64
2224
bin/%/$(PROVIDER) bin/%/$(PROVIDER).exe: bin/jsign-6.0.jar
2325
$(call build_provider_cmd,$(GOOS),$(GOARCH),$(WORKING_DIR)/$@)
2426

2527
@# Only sign windows binary if fully configured.
2628
@# Test variables set by joining with | between and looking for || showing at least one variable is empty.
2729
@# Move the binary to a temporary location and sign it there to avoid the target being up-to-date if signing fails.
2830
@set -e; \
29-
if [[ "${GOOS}-${GOARCH}" = "windows-amd64" && "${SKIP_SIGNING}" != "true" ]]; then \
31+
if [[ "${GOOS}" = "windows" && "${SKIP_SIGNING}" != "true" ]]; then \
3032
if [[ "|${AZURE_SIGNING_CLIENT_ID}|${AZURE_SIGNING_CLIENT_SECRET}|${AZURE_SIGNING_TENANT_ID}|${AZURE_SIGNING_KEY_VAULT_URI}|" == *"||"* ]]; then \
3133
echo "Can't sign windows binaries as required configuration not set: AZURE_SIGNING_CLIENT_ID, AZURE_SIGNING_CLIENT_SECRET, AZURE_SIGNING_TENANT_ID, AZURE_SIGNING_KEY_VAULT_URI"; \
3234
echo "To rebuild with signing delete the unsigned $@ and rebuild with the fixed configuration"; \
@@ -58,13 +60,15 @@ provider-linux-arm64: bin/linux-arm64/$(PROVIDER)
5860
provider-darwin-amd64: bin/darwin-amd64/$(PROVIDER)
5961
provider-darwin-arm64: bin/darwin-arm64/$(PROVIDER)
6062
provider-windows-amd64: bin/windows-amd64/$(PROVIDER).exe
61-
.PHONY: provider-linux-amd64 provider-linux-arm64 provider-darwin-amd64 provider-darwin-arm64 provider-windows-amd64
63+
provider-windows-arm64: bin/windows-arm64/$(PROVIDER).exe
64+
.PHONY: provider-linux-amd64 provider-linux-arm64 provider-darwin-amd64 provider-darwin-arm64 provider-windows-amd64 provider-windows-arm64
6265

6366
bin/$(PROVIDER)-v$(PROVIDER_VERSION)-linux-amd64.tar.gz: bin/linux-amd64/$(PROVIDER)
6467
bin/$(PROVIDER)-v$(PROVIDER_VERSION)-linux-arm64.tar.gz: bin/linux-arm64/$(PROVIDER)
6568
bin/$(PROVIDER)-v$(PROVIDER_VERSION)-darwin-amd64.tar.gz: bin/darwin-amd64/$(PROVIDER)
6669
bin/$(PROVIDER)-v$(PROVIDER_VERSION)-darwin-arm64.tar.gz: bin/darwin-arm64/$(PROVIDER)
6770
bin/$(PROVIDER)-v$(PROVIDER_VERSION)-windows-amd64.tar.gz: bin/windows-amd64/$(PROVIDER).exe
71+
bin/$(PROVIDER)-v$(PROVIDER_VERSION)-windows-arm64.tar.gz: bin/windows-arm64/$(PROVIDER).exe
6872
bin/$(PROVIDER)-v$(PROVIDER_VERSION)-%.tar.gz:
6973
@mkdir -p dist
7074
@# $< is the last dependency (the binary path from above) e.g. bin/linux-amd64/pulumi-resource-xyz
@@ -76,5 +80,6 @@ provider_dist-linux-arm64: bin/$(PROVIDER)-v$(PROVIDER_VERSION)-linux-arm64.tar.
7680
provider_dist-darwin-amd64: bin/$(PROVIDER)-v$(PROVIDER_VERSION)-darwin-amd64.tar.gz
7781
provider_dist-darwin-arm64: bin/$(PROVIDER)-v$(PROVIDER_VERSION)-darwin-arm64.tar.gz
7882
provider_dist-windows-amd64: bin/$(PROVIDER)-v$(PROVIDER_VERSION)-windows-amd64.tar.gz
83+
provider_dist-windows-arm64: bin/$(PROVIDER)-v$(PROVIDER_VERSION)-windows-arm64.tar.gz
7984
provider_dist: provider_dist-linux-amd64 provider_dist-linux-arm64 provider_dist-darwin-amd64 provider_dist-darwin-arm64 provider_dist-windows-amd64
8085
.PHONY: provider_dist-linux-amd64 provider_dist-linux-arm64 provider_dist-darwin-amd64 provider_dist-darwin-arm64 provider_dist-windows-amd64 provider_dist

0 commit comments

Comments
 (0)