Skip to content

Commit

Permalink
Update GitHub Actions workflows. (#543)
Browse files Browse the repository at this point in the history
This PR was automatically generated by the
update-workflows-ecosystem-providers workflow in the pulumi/ci-mgmt
repo, from commit 8e401dced2ed99ea4b008e9a2a61a0945ddf9bb7.
  • Loading branch information
pulumi-bot authored Jul 9, 2024
1 parent 6b60f5b commit dec0ed7
Show file tree
Hide file tree
Showing 4 changed files with 376 additions and 5 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/build_provider.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ jobs:
- name: Download schema-embed.json
uses: actions/download-artifact@v4
with:
name: schema-embed.json
# 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-keycloak/schema-embed.json
- name: Prepare for build
# This installs plugins and prepares upstream
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/run-acceptance-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ jobs:
github.event.pull_request.head.repo.full_name == github.repository
needs:
- test
- build_provider
- license_check
- lint
runs-on: ubuntu-latest
Expand Down
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,16 @@ tfgen_build_only:

upstream:
ifneq ("$(wildcard upstream)","")
scripts/upstream.sh "$@" apply
./upstream.sh init
endif

upstream.finalize:
scripts/upstream.sh "$@" end_rebase
echo "Deprecated: Use `./upstream.sh format_patches` instead"
scripts/upstream_old.sh "$@" end_rebase

upstream.rebase:
scripts/upstream.sh "$@" start_rebase
echo "Deprecated: Use `./upstream.sh checkout` and `./upstream.sh rebase` instead"
scripts/upstream_old.sh "$@" start_rebase

bin/pulumi-java-gen: .pulumi-java-gen.version
pulumictl download-binary -n pulumi-language-java -v v$(shell cat .pulumi-java-gen.version) -r pulumi/pulumi-java
Expand Down Expand Up @@ -212,7 +214,7 @@ bin/linux-arm64/$(PROVIDER): TARGET := linux-arm64
bin/darwin-amd64/$(PROVIDER): TARGET := darwin-amd64
bin/darwin-arm64/$(PROVIDER): TARGET := darwin-arm64
bin/windows-amd64/$(PROVIDER).exe: TARGET := windows-amd64
bin/%/$(PROVIDER) bin/%/$(PROVIDER).exe: provider/cmd/$(PROVIDER)/schema-embed.json
bin/%/$(PROVIDER) bin/%/$(PROVIDER).exe:
@# check the TARGET is set
test $(TARGET)
cd provider && \
Expand Down
Loading

0 comments on commit dec0ed7

Please sign in to comment.