Update GitHub Actions workflows. (#285)

This PR was automatically generated by the update-workflows-ecosystem-providers workflow in the pulumi/ci-mgmt repo, from commit ce0e76305f20f6f6bdef94dd5e8951c6b405dd17. --------- Co-authored-by: Ian Wahbe <[email protected]>
pulumi · Oct 12, 2023 · e0eb3e4 · e0eb3e4
1 parent 07c56ed
commit e0eb3e4
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 20 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -61,7 +61,7 @@ jobs:
         node-version: ${{ env.NODEVERSION }}
         registry-url: https://registry.npmjs.org
     - name: Setup DotNet
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: ${{ env.DOTNETVERSION }}
     - name: Setup Python
@@ -209,6 +209,8 @@ jobs:
         repo: pulumi/schema-tools
     - name: Build tfgen & provider binaries
       run: make provider
+    - name: Unit-test provider code
+      run: make test_provider
     - if: github.event_name == 'pull_request'
       name: Check Schema is Valid
       run: |
@@ -302,7 +304,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Publish SDKs
-      uses: pulumi/[email protected].11
+      uses: pulumi/[email protected].12
     - env:
         SLACK_CHANNEL: provider-upgrade-publish-status
         SLACK_COLOR: "#FF0000"
@@ -367,7 +369,7 @@ jobs:
         node-version: ${{ env.NODEVERSION }}
         registry-url: https://registry.npmjs.org
     - name: Setup DotNet
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: ${{ env.DOTNETVERSION }}
     - name: Setup Python

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -62,7 +62,7 @@ jobs:
         node-version: ${{ env.NODEVERSION }}
         registry-url: https://registry.npmjs.org
     - name: Setup DotNet
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: ${{ env.DOTNETVERSION }}
     - name: Setup Python
@@ -156,6 +156,8 @@ jobs:
         repo: pulumi/schema-tools
     - name: Build tfgen & provider binaries
       run: make provider
+    - name: Unit-test provider code
+      run: make test_provider
     - if: github.event_name == 'pull_request'
       name: Check Schema is Valid
       run: |
@@ -248,7 +250,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Publish SDKs
-      uses: pulumi/[email protected].11
+      uses: pulumi/[email protected].12
     - env:
         SLACK_CHANNEL: provider-upgrade-publish-status
         SLACK_COLOR: "#FF0000"
@@ -295,7 +297,7 @@ jobs:
         node-version: ${{ env.NODEVERSION }}
         registry-url: https://registry.npmjs.org
     - name: Setup DotNet
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: ${{ env.DOTNETVERSION }}
     - name: Setup Python

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -61,7 +61,7 @@ jobs:
         node-version: ${{ env.NODEVERSION }}
         registry-url: https://registry.npmjs.org
     - name: Setup DotNet
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: ${{ env.DOTNETVERSION }}
     - name: Setup Python
@@ -169,6 +169,8 @@ jobs:
         repo: pulumi/schema-tools
     - name: Build tfgen & provider binaries
       run: make provider
+    - name: Unit-test provider code
+      run: make test_provider
     - if: github.event_name == 'pull_request'
       name: Check Schema is Valid
       run: |
@@ -260,7 +262,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Publish SDKs
-      uses: pulumi/[email protected].11
+      uses: pulumi/[email protected].12
     - env:
         SLACK_CHANNEL: provider-upgrade-publish-status
         SLACK_COLOR: "#FF0000"
@@ -341,7 +343,7 @@ jobs:
         node-version: ${{ env.NODEVERSION }}
         registry-url: https://registry.npmjs.org
     - name: Setup DotNet
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: ${{ env.DOTNETVERSION }}
     - name: Setup Python

diff --git a/.github/workflows/resync-build.yml b/.github/workflows/resync-build.yml
@@ -60,7 +60,7 @@ jobs:
     - name: Install Pulumi CLI
       uses: pulumi/action-install-pulumi-cli@v2
     - name: Setup DotNet
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: ${{ env.DOTNETVERSION }}
     - name: Setup Node

diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml
@@ -66,7 +66,7 @@ jobs:
         node-version: ${{ env.NODEVERSION }}
         registry-url: https://registry.npmjs.org
     - name: Setup DotNet
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: ${{ env.DOTNETVERSION }}
     - name: Setup Python
@@ -180,6 +180,8 @@ jobs:
         repo: pulumi/schema-tools
     - name: Build tfgen & provider binaries
       run: make provider
+    - name: Unit-test provider code
+      run: make test_provider
     - if: github.event_name == 'pull_request'
       name: Check Schema is Valid
       run: |
@@ -297,7 +299,7 @@ jobs:
         node-version: ${{ env.NODEVERSION }}
         registry-url: https://registry.npmjs.org
     - name: Setup DotNet
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: ${{ env.DOTNETVERSION }}
     - name: Setup Python

diff --git a/.github/workflows/upgrade-bridge.yml b/.github/workflows/upgrade-bridge.yml
@@ -9,9 +9,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Call upgrade provider action
-      uses: pulumi/[email protected].6
+      uses: pulumi/[email protected].8
       with:
         kind: bridge
+        email: [email protected]
+        username: pulumi-bot
+        automerge: ${{ inputs.automerge }}
     - env:
         SLACK_CHANNEL: provider-upgrade-publish-status
         SLACK_COLOR: "#7CFC00"
@@ -38,4 +41,10 @@ jobs:
       uses: rtCamp/action-slack-notify@v2
 name: Upgrade bridge
 on:
-  workflow_dispatch: {}
+  workflow_dispatch:
+    inputs:
+      automerge:
+        description: Mark created PR for auto-merging?
+        required: false
+        type: boolean
+        default: false
diff --git a/.github/workflows/upgrade-provider.yml b/.github/workflows/upgrade-provider.yml
@@ -10,9 +10,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Call upgrade provider action
-      uses: pulumi/[email protected].6
+      uses: pulumi/[email protected].8
       with:
         kind: all
+        email: [email protected]
+        username: pulumi-bot
     - env:
         SLACK_CHANNEL: provider-upgrade-publish-status
         SLACK_COLOR: "#7CFC00"

diff --git a/.upgrade-config.yml b/.upgrade-config.yml
@@ -6,3 +6,4 @@ pulumi-infer-version: true
 remove-plugins: true
 pr-reviewers: pulumi/Providers,lukehoban
 
+javaVersion: "v0.9.3"
diff --git a/Makefile b/Makefile
@@ -105,6 +105,12 @@ provider: tfgen install_plugins
 test:
 	cd examples && go test -v -tags=all -parallel $(TESTPARALLELISM) -timeout 2h
 
+test_provider:
+	@echo ""
+	@echo "== test_provider ==================================================================="
+	@echo ""
+	cd provider && go test -v -short ./... -parallel $(TESTPARALLELISM)
+
 tfgen: install_plugins upstream
 	(cd provider && go build $(PULUMI_PROVIDER_BUILD_PARALLELISM) -o $(WORKING_DIR)/bin/$(TFGEN) -ldflags "-X $(PROJECT)/$(VERSION_PATH)=$(VERSION)" $(PROJECT)/$(PROVIDER_PATH)/cmd/$(TFGEN))
 	PATH=${PWD}/.pulumi/bin:$$PATH PULUMI_CONVERT=$(PULUMI_CONVERT) $(WORKING_DIR)/bin/$(TFGEN) schema --out provider/cmd/$(PROVIDER)
@@ -137,13 +143,12 @@ ci-mgmt: .ci-mgmt.yaml
 		--template bridged-provider \
 		--config $<
 
-.pulumi/bin/pulumi: HOME := $(WORKING_DIR)
 .pulumi/bin/pulumi: .pulumi/version
-	curl -fsSL https://get.pulumi.com | sh -s -- --version $(cat .pulumi/version)
+	curl -fsSL https://get.pulumi.com | HOME=$(WORKING_DIR) sh -s -- --version $(cat .pulumi/version)
 
 # Compute the version of Pulumi to use by inspecting the Go dependencies of the provider.
 .pulumi/version:
 	@mkdir -p .pulumi
 	@cd provider && go list -f "{{slice .Version 1}}" -m github.com/pulumi/pulumi/pkg/v3 | tee ../$@
 
-.PHONY: development build build_sdks install_go_sdk install_java_sdk install_python_sdk install_sdks only_build build_dotnet build_go build_java build_nodejs build_python clean cleanup help install_dotnet_sdk install_nodejs_sdk install_plugins lint_provider provider test tfgen upstream upstream.finalize upstream.rebase ci-mgmt
+.PHONY: development build build_sdks install_go_sdk install_java_sdk install_python_sdk install_sdks only_build build_dotnet build_go build_java build_nodejs build_python clean cleanup help install_dotnet_sdk install_nodejs_sdk install_plugins lint_provider provider test tfgen upstream upstream.finalize upstream.rebase ci-mgmt test_provider
diff --git a/examples/user/python/requirements.txt b/examples/user/python/requirements.txt
@@ -1,2 +1,2 @@
-pulumi>=3.0.0a1,<4.0.0
-pulumi_random>=4.0.0a1,<5.0.0
+pulumi>=3.0.0,<4.0.0
+pulumi_random>=4.0.0,<5.0.0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,4 @@ pulumi-infer-version: true
		remove-plugins: true
		pr-reviewers: pulumi/Providers,lukehoban

		javaVersion: "v0.9.3"