Skip to content

Commit 75cdb37

Browse files
authored
Update GitHub Actions workflows. (#1367)
This PR was automatically generated by the update-workflows-ecosystem-providers workflow in the pulumi/ci-mgmt repo, from commit 2b81d6d332c32c7ebc106fb53b745cbbfec266c7.
1 parent 57597e2 commit 75cdb37

5,290 files changed

Lines changed: 5330 additions & 9288 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build_sdk.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ jobs:
7777
run: make --touch provider schema
7878
- name: Build SDK
7979
run: make build_${{ matrix.language }}
80+
8081
- name: Check worktree clean
8182
id: worktreeClean
8283
uses: pulumi/git-status-check-action@v1
@@ -88,6 +89,47 @@ jobs:
8889
sdk/go/**/pulumiUtilities.go
8990
sdk/nodejs/package.json
9091
sdk/python/pyproject.toml
92+
sdk/java/build.gradle
93+
- name: Commit Java SDK changes for migration to pulumi package gen-sdk
94+
if: failure() && steps.worktreeClean.outcome == 'failure' && matrix.language == 'java' && contains(github.actor, 'pulumi-bot') && github.event_name == 'pull_request'
95+
shell: bash
96+
run: >
97+
git diff --quiet -- sdk/java && echo "no changes to sdk/java" && exit
98+
99+
git config --global user.email "bot@pulumi.com"
100+
101+
git config --global user.name "pulumi-bot"
102+
103+
# Stash local changes and check out the PR's branch directly.
104+
105+
git stash
106+
107+
git fetch
108+
109+
git checkout "origin/$HEAD_REF"
110+
111+
# Apply and add our changes, but don't commit any files we expect to
112+
113+
# always change due to versioning.
114+
115+
git stash pop
116+
117+
git add sdk/java
118+
119+
rm .pulumi-java-gen.version
120+
121+
git add .pulumi-java-gen.version
122+
123+
git commit -m "Commit Java changes for pulumi package sdk-gen"
124+
125+
# Push with pulumi-bot credentials to trigger a re-run of the
126+
# workflow. https://github.com/orgs/community/discussions/25702
127+
128+
git push https://pulumi-bot:${{ steps.esc-secrets.outputs.PULUMI_BOT_TOKEN }}@github.com/${{ github.repository }} "HEAD:$HEAD_REF"
129+
# head_ref is untrusted so it's recommended to pass via env var to
130+
# avoid injections.
131+
env:
132+
HEAD_REF: ${{ github.head_ref }}
91133
- name: Commit ${{ matrix.language }} SDK changes for Renovate
92134
# If the worktree is dirty and this is a Renovate PR to bump
93135
# dependencies, commit the updated SDK and push it back to the PR. The

.github/workflows/upgrade-java.yml

Lines changed: 0 additions & 72 deletions
This file was deleted.

.pulumi-java-gen.version

Lines changed: 0 additions & 1 deletion
This file was deleted.

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ PROVIDER_PATH := provider/v6
77
VERSION_PATH := $(PROVIDER_PATH)/pkg/version.Version
88
CODEGEN := pulumi-tfgen-$(PACK)
99
PROVIDER := pulumi-resource-$(PACK)
10-
JAVA_GEN := pulumi-java-gen
1110
TESTPARALLELISM := 10
1211
GOTESTARGS := ""
1312
WORKING_DIR := $(shell pwd)
@@ -125,8 +124,8 @@ generate_java: .make/generate_java
125124
build_java: .make/build_java
126125
.make/generate_java: export PATH := $(WORKING_DIR)/.pulumi/bin:$(PATH)
127126
.make/generate_java: PACKAGE_VERSION := $(PROVIDER_VERSION)
128-
.make/generate_java: .make/install_plugins bin/pulumi-java-gen .make/schema
129-
PULUMI_HOME=$(GEN_PULUMI_HOME) PULUMI_CONVERT_EXAMPLES_CACHE_DIR=$(GEN_PULUMI_CONVERT_EXAMPLES_CACHE_DIR) bin/$(JAVA_GEN) generate --schema provider/cmd/$(PROVIDER)/schema.json --out sdk/java --build gradle-nexus
127+
.make/generate_java: .make/install_plugins bin/$(CODEGEN)
128+
$(GEN_ENVS) $(WORKING_DIR)/bin/$(CODEGEN) java --out sdk/java/
130129
printf "module fake_java_module // Exclude this directory from Go tools\n\ngo 1.17\n" > sdk/java/go.mod
131130
@touch $@
132131
.make/build_java: PACKAGE_VERSION := $(PROVIDER_VERSION)

sdk/java/Pulumi.yaml

Whitespace-only changes.

sdk/java/build.gradle

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/java/src/main/java/com/pulumi/cloudflare/AccessApplication.java

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/java/src/main/java/com/pulumi/cloudflare/AccessApplicationArgs.java

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/java/src/main/java/com/pulumi/cloudflare/AccessCaCertificate.java

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/java/src/main/java/com/pulumi/cloudflare/AccessCaCertificateArgs.java

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)