Skip to content

Commit

Permalink
Update GitHub Actions workflows. (#929)
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 a78a1883f05f2a49cdce26557c97f3af2dc97094.
  • Loading branch information
pulumi-bot authored Dec 3, 2024
1 parent d0792ec commit 76e9b00
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 97 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_provider.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
pattern: schema-embed.*
# Avoid creating directories for each artifact
merge-multiple: true
path: provider/cmd/pulumi-resource-newrelic/schema-embed.json
path: provider/cmd/pulumi-resource-newrelic
- name: Restore makefile progress
run: make --touch provider schema
- name: Build & package provider
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ jobs:
version: ${{ needs.prerequisites.outputs.version }}
isPrerelease: true
skipGoSdk: true
skipJavaSdk: true

tag_release_if_labeled_needs_release:
name: Tag release if labeled as needs-release
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/prerequisites.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ jobs:
run: make prepare_local_workspace
- name: Generate schema
run: make schema
- name: Build registry docs
run: make build_registry_docs
- name: Build provider binary
run: make provider
- name: Unit-test provider code
Expand Down
11 changes: 11 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ on:
default: false
type: boolean
description: Skip publishing & verifying the Go SDK
skipJavaSdk:
default: false
type: boolean
description: Skip publishing the Java SDK

env:
IS_PRERELEASE: ${{ inputs.isPrerelease }}
Expand Down Expand Up @@ -121,10 +125,17 @@ jobs:
with:
tools: pulumictl, pulumicli, nodejs, python, dotnet, go, java
- name: Publish SDKs
if: inputs.skipJavaSdk == false
uses: pulumi/pulumi-package-publisher@1c0359ba74243cf6651efacfd839c751d8ff87e2 # v0.0.20
with:
sdk: all
version: ${{ inputs.version }}
- name: Publish SDKs (except Java)
if: inputs.skipJavaSdk == true
uses: pulumi/pulumi-package-publisher@1c0359ba74243cf6651efacfd839c751d8ff87e2 # v0.0.20
with:
sdk: all,!java
version: ${{ inputs.version }}
- name: Download Go SDK
uses: ./.github/actions/download-sdk
with:
Expand Down
91 changes: 0 additions & 91 deletions .github/workflows/resync-build.yml

This file was deleted.

12 changes: 7 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ LDFLAGS=$(LDFLAGS_PROJ_VERSION) $(LDFLAGS_UPSTREAM_VERSION) $(LDFLAGS_EXTRAS) $(
_ := $(shell mkdir -p .make bin .pulumi/bin)

# Build the provider and all SDKs and install ready for testing
build: install_plugins provider build_sdks install_sdks
build: install_plugins provider build_sdks install_sdks build_registry_docs
# Keep aliases for old targets to ensure backwards compatibility
development: build
only_build: build
# Prepare the workspace for building the provider and SDKs
# Importantly this is run by CI ahead of restoring the bin directory and resuming SDK builds
prepare_local_workspace: install_plugins upstream
# Creates all generated files which need to be committed
generate: generate_sdks schema
generate: generate_sdks schema build_registry_docs
generate_sdks: generate_nodejs generate_python generate_dotnet generate_go generate_java
build_sdks: build_nodejs build_python build_dotnet build_go build_java
install_sdks: install_nodejs_sdk install_python_sdk install_dotnet_sdk install_go_sdk install_java_sdk
Expand Down Expand Up @@ -166,10 +166,12 @@ build_python: .make/build_python
../venv/bin/python -m build .
@touch $@
.PHONY: generate_python build_python

# Run the bridge's registry-docs command to generated the content of the installation docs/ folder at provider repo root
build_registry_docs:
$(WORKING_DIR)/bin/$(TFGEN) registry-docs --out $(WORKING_DIR)/docs
build_registry_docs: .make/build_registry_docs
.make/build_registry_docs: bin/$(TFGEN)
bin/$(TFGEN) registry-docs --out $(WORKING_DIR)/docs
@touch $@
.PHONY: build_registry_docs

clean:
rm -rf sdk/{dotnet,nodejs,go,python}
Expand Down

0 comments on commit 76e9b00

Please sign in to comment.