Skip to content

Commit cde2224

Browse files
authored
Update GitHub Actions workflows. (#1029)
This PR was automatically generated by the update-workflows-ecosystem-providers workflow in the pulumi/ci-mgmt repo, from commit 108f0505de8d7149b2bc6846bb4e9c80984ea4b1.
1 parent 16b6ad1 commit cde2224

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
- name: Upload Provider Binaries
9898
run: aws s3 cp dist s3://get.pulumi.com/releases/plugins/ --recursive
9999
- name: Create GH Release
100-
uses: softprops/action-gh-release@e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8 # v2
100+
uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # v2
101101
if: inputs.isPrerelease == false
102102
with:
103103
tag_name: v${{ inputs.version }}

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ LDFLAGS=$(LDFLAGS_PROJ_VERSION) $(LDFLAGS_UPSTREAM_VERSION) $(LDFLAGS_EXTRAS) $(
2929

3030
# Create a `.make` directory for tracking targets which don't generate a single file output. This should be ignored by git.
3131
# For targets which either don't generate a single file output, or the output file is committed, we use a "sentinel"
32-
# file within `.make/` to track the staleness of the target and only rebuild when needed.
32+
# file within `.make/` to track the staleness of the target and only rebuild when needed.
3333
# For each phony target, we create an internal target with the same name, but prefixed with `.make/` where the work is performed.
3434
# At the end of each internal target we run `@touch $@` to update the file which is the name of the target.
3535

@@ -326,22 +326,22 @@ bin/darwin-arm64/$(PROVIDER): TARGET := darwin-arm64
326326
bin/windows-amd64/$(PROVIDER).exe: TARGET := windows-amd64
327327
bin/%/$(PROVIDER) bin/%/$(PROVIDER).exe: bin/jsign-6.0.jar
328328
@# check the TARGET is set
329-
test $(TARGET)
330-
cd provider && \
329+
@test $(TARGET)
330+
@cd provider && \
331331
export GOOS=$$(echo "$(TARGET)" | cut -d "-" -f 1) && \
332332
export GOARCH=$$(echo "$(TARGET)" | cut -d "-" -f 2) && \
333333
export CGO_ENABLED=0 && \
334334
go build -o "${WORKING_DIR}/$@" $(PULUMI_PROVIDER_BUILD_PARALLELISM) -ldflags "$(LDFLAGS)" "$(PROJECT)/$(PROVIDER_PATH)/cmd/$(PROVIDER)"
335335

336-
@# Only sign windows binary if fully configured.
336+
@# Only sign windows binary if fully configured.
337337
@# Test variables set by joining with | between and looking for || showing at least one variable is empty.
338338
@# Move the binary to a temporary location and sign it there to avoid the target being up-to-date if signing fails.
339-
set -e; \
340-
if [[ "${TARGET}" = "windows-amd64" && ${SKIP_SIGNING} != "true" ]]; then \
339+
@set -e; \
340+
if [[ "${TARGET}" = "windows-amd64" && "${SKIP_SIGNING}" != "true" ]]; then \
341341
if [[ "|${AZURE_SIGNING_CLIENT_ID}|${AZURE_SIGNING_CLIENT_SECRET}|${AZURE_SIGNING_TENANT_ID}|${AZURE_SIGNING_KEY_VAULT_URI}|" == *"||"* ]]; then \
342342
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"; \
343343
echo "To rebuild with signing delete the unsigned $@ and rebuild with the fixed configuration"; \
344-
if [[ ${CI} == "true" ]]; then exit 1; fi; \
344+
if [[ "${CI}" == "true" ]]; then exit 1; fi; \
345345
else \
346346
347347
az login --service-principal \

0 commit comments

Comments
 (0)