Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Makefile detection of java version #747

Merged
merged 8 commits into from
Dec 13, 2023
Merged

Update Makefile detection of java version #747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
46f199d
Use version file as Make target dependency
guineveresaenger Dec 9, 2023
25959d6
Allow for target java version to be passed to upgrade-provider-action
guineveresaenger Dec 9, 2023
24a6b61
remove javaGenVersion from aws and docker test providers but leave in…
guineveresaenger Dec 11, 2023
617c8b9
Check for existence of `javaGenVersion` config key for upgrade config
guineveresaenger Dec 11, 2023
69784ea
Regenerate Test Workflows
guineveresaenger Dec 11, 2023
763000e
Allow for targeted Java version in upgrade bridge workflow
guineveresaenger Dec 12, 2023
f9a1cad
Upgrade upgrade-provider-action version so it can handle java version
guineveresaenger Dec 12, 2023
086447a
fix file name
guineveresaenger Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions provider-ci/internal/pkg/templates/bridged-provider.config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
major-version: 2
javaGenVersion: v0.5.4
#javaGenVersion: 0.0.0
parallel: 3
timeout: 60
lint: true
Expand Down Expand Up @@ -82,6 +82,6 @@ actionVersions:
prComment: thollander/actions-comment-pull-request@v2
slashCommand: peter-evans/slash-command-dispatch@v2
uploadArtifact: actions/upload-artifact@v2
upgradeProviderAction: pulumi/pulumi-upgrade-provider-action@v0.0.10
upgradeProviderAction: pulumi/pulumi-upgrade-provider-action@v0.0.11
publishProviderSDKs: pulumi/pulumi-package-publisher@v0.0.12
slackNotification: rtCamp/action-slack-notify@v2
3 changes: 3 additions & 0 deletions provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/upgrade-bridge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ jobs:
automerge: ${{ inputs.automerge }}
target-bridge-version: ${{ inputs.target-bridge-version }}
target-pulumi-version: ${{ inputs.target-pulumi-version }}
#{{- if .Config.javaGenVersion }}#
target-java-version: #{{ .Config.javaGenVersion }}#
#{{- end }}#
pr-reviewers: ${{ inputs.pr-reviewers }}
pr-description: ${{ inputs.pr-description }}
- name: Call upgrade provider action
Expand Down
3 changes: 3 additions & 0 deletions provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/upgrade-provider.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ jobs:
uses: #{{ .Config.actionVersions.upgradeProviderAction }}#
with:
kind: all
#{{- if .Config.javaGenVersion }}#
target-java-version: #{{ .Config.javaGenVersion }}#
#{{- end }}#
email: bot@pulumi.com
username: pulumi-bot
- env:
Expand Down
2 changes: 2 additions & 0 deletions provider-ci/internal/pkg/templates/bridged-provider/.upgrade-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ upstream-provider-name: terraform-provider-#{{ .Config.provider }}#
pulumi-infer-version: true
remove-plugins: true
pr-reviewers: iwahbe # Team: pulumi/Providers
#{{- if (index .Config "javaGenVersion") }}#
javaVersion: "#{{ .Config.javaGenVersion }}#"
#{{- end }}#
5 changes: 2 additions & 3 deletions provider-ci/internal/pkg/templates/bridged-provider/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ TFGEN := pulumi-tfgen-$(PACK)
PROVIDER := pulumi-resource-$(PACK)
VERSION := $(shell pulumictl get version)
JAVA_GEN := pulumi-java-gen
JAVA_GEN_VERSION := #{{ .Config.javaGenVersion }}#
TESTPARALLELISM := 10
WORKING_DIR := $(shell pwd)
#{{- if .Config.goBuildParallelism }}#
Expand Down Expand Up @@ -161,8 +160,8 @@ upstream.finalize:
upstream.rebase:
scripts/upstream.sh "$@" start_rebase

bin/pulumi-java-gen:
pulumictl download-binary -n pulumi-language-java -v $(JAVA_GEN_VERSION) -r pulumi/pulumi-java
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

# To make an immediately observable change to .ci-mgmt.yaml:
#
Expand Down
1 change: 0 additions & 1 deletion provider-ci/providers/aws/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ plugins:
version: "5.14.0"
team: ecosystem
goBuildParallelism: 2
javaGenVersion: "v0.9.5"
runner:
publish: pulumi-ubuntu-8core
buildSdk: pulumi-ubuntu-8core
Expand Down
1 change: 0 additions & 1 deletion provider-ci/providers/docker/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,3 @@ actions:
uses: webfactory/ssh-agent@v0.7.0
with:
ssh-private-key: ${{ secrets.PRIVATE_SSH_KEY_FOR_DIGITALOCEAN }}
javaGenVersion: "v0.9.7"
4 changes: 2 additions & 2 deletions provider-ci/test-workflows/aws/.github/workflows/upgrade-bridge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
steps:
- name: Call upgrade provider action
if: github.event_name == 'workflow_dispatch'
uses: pulumi/pulumi-upgrade-provider-action@v0.0.10
uses: pulumi/pulumi-upgrade-provider-action@v0.0.11
with:
kind: bridge
email: bot@pulumi.com
Expand All @@ -60,7 +60,7 @@ jobs:
pr-description: ${{ inputs.pr-description }}
- name: Call upgrade provider action
if: github.event_name == 'repository_dispatch'
uses: pulumi/pulumi-upgrade-provider-action@v0.0.10
uses: pulumi/pulumi-upgrade-provider-action@v0.0.11
with:
kind: bridge
email: bot@pulumi.com
Expand Down
2 changes: 1 addition & 1 deletion provider-ci/test-workflows/aws/.github/workflows/upgrade-provider.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Call upgrade provider action
uses: pulumi/pulumi-upgrade-provider-action@v0.0.10
uses: pulumi/pulumi-upgrade-provider-action@v0.0.11
with:
kind: all
email: bot@pulumi.com
Expand Down
1 change: 0 additions & 1 deletion provider-ci/test-workflows/aws/.upgrade-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ upstream-provider-name: terraform-provider-aws
pulumi-infer-version: true
remove-plugins: true
pr-reviewers: iwahbe # Team: pulumi/Providers
javaVersion: "v0.9.5"
5 changes: 2 additions & 3 deletions provider-ci/test-workflows/aws/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ TFGEN := pulumi-tfgen-$(PACK)
PROVIDER := pulumi-resource-$(PACK)
VERSION := $(shell pulumictl get version)
JAVA_GEN := pulumi-java-gen
JAVA_GEN_VERSION := v0.9.5
TESTPARALLELISM := 10
WORKING_DIR := $(shell pwd)
PULUMI_PROVIDER_BUILD_PARALLELISM ?= -p 2
Expand Down Expand Up @@ -144,8 +143,8 @@ upstream.finalize:
upstream.rebase:
scripts/upstream.sh "$@" start_rebase

bin/pulumi-java-gen:
pulumictl download-binary -n pulumi-language-java -v $(JAVA_GEN_VERSION) -r pulumi/pulumi-java
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

# To make an immediately observable change to .ci-mgmt.yaml:
#
Expand Down
5 changes: 3 additions & 2 deletions provider-ci/test-workflows/cloudflare/.github/workflows/upgrade-bridge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,20 @@ jobs:
steps:
- name: Call upgrade provider action
if: github.event_name == 'workflow_dispatch'
uses: pulumi/pulumi-upgrade-provider-action@v0.0.10
uses: pulumi/pulumi-upgrade-provider-action@v0.0.11
with:
kind: bridge
email: bot@pulumi.com
username: pulumi-bot
automerge: ${{ inputs.automerge }}
target-bridge-version: ${{ inputs.target-bridge-version }}
target-pulumi-version: ${{ inputs.target-pulumi-version }}
target-java-version: v0.9.3
pr-reviewers: ${{ inputs.pr-reviewers }}
pr-description: ${{ inputs.pr-description }}
- name: Call upgrade provider action
if: github.event_name == 'repository_dispatch'
uses: pulumi/pulumi-upgrade-provider-action@v0.0.10
uses: pulumi/pulumi-upgrade-provider-action@v0.0.11
with:
kind: bridge
email: bot@pulumi.com
Expand Down
3 changes: 2 additions & 1 deletion provider-ci/test-workflows/cloudflare/.github/workflows/upgrade-provider.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Call upgrade provider action
uses: pulumi/pulumi-upgrade-provider-action@v0.0.10
uses: pulumi/pulumi-upgrade-provider-action@v0.0.11
with:
kind: all
target-java-version: v0.9.3
email: bot@pulumi.com
username: pulumi-bot
- env:
Expand Down
5 changes: 2 additions & 3 deletions provider-ci/test-workflows/cloudflare/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ TFGEN := pulumi-tfgen-$(PACK)
PROVIDER := pulumi-resource-$(PACK)
VERSION := $(shell pulumictl get version)
JAVA_GEN := pulumi-java-gen
JAVA_GEN_VERSION := v0.9.3
TESTPARALLELISM := 10
WORKING_DIR := $(shell pwd)
PULUMI_CONVERT := 0
Expand Down Expand Up @@ -134,8 +133,8 @@ upstream.finalize:
upstream.rebase:
scripts/upstream.sh "$@" start_rebase

bin/pulumi-java-gen:
pulumictl download-binary -n pulumi-language-java -v $(JAVA_GEN_VERSION) -r pulumi/pulumi-java
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

# To make an immediately observable change to .ci-mgmt.yaml:
#
Expand Down
4 changes: 2 additions & 2 deletions provider-ci/test-workflows/docker/.github/workflows/upgrade-bridge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
steps:
- name: Call upgrade provider action
if: github.event_name == 'workflow_dispatch'
uses: pulumi/pulumi-upgrade-provider-action@v0.0.10
uses: pulumi/pulumi-upgrade-provider-action@v0.0.11
with:
kind: bridge
email: bot@pulumi.com
Expand All @@ -60,7 +60,7 @@ jobs:
pr-description: ${{ inputs.pr-description }}
- name: Call upgrade provider action
if: github.event_name == 'repository_dispatch'
uses: pulumi/pulumi-upgrade-provider-action@v0.0.10
uses: pulumi/pulumi-upgrade-provider-action@v0.0.11
with:
kind: bridge
email: bot@pulumi.com
Expand Down
2 changes: 1 addition & 1 deletion provider-ci/test-workflows/docker/.github/workflows/upgrade-provider.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Call upgrade provider action
uses: pulumi/pulumi-upgrade-provider-action@v0.0.10
uses: pulumi/pulumi-upgrade-provider-action@v0.0.11
with:
kind: all
email: bot@pulumi.com
Expand Down
1 change: 0 additions & 1 deletion provider-ci/test-workflows/docker/.upgrade-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ upstream-provider-name: terraform-provider-docker
pulumi-infer-version: true
remove-plugins: true
pr-reviewers: iwahbe # Team: pulumi/Providers
javaVersion: "v0.9.7"
5 changes: 2 additions & 3 deletions provider-ci/test-workflows/docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ TFGEN := pulumi-tfgen-$(PACK)
PROVIDER := pulumi-resource-$(PACK)
VERSION := $(shell pulumictl get version)
JAVA_GEN := pulumi-java-gen
JAVA_GEN_VERSION := v0.9.7
TESTPARALLELISM := 10
WORKING_DIR := $(shell pwd)
PULUMI_CONVERT := 0
Expand Down Expand Up @@ -136,8 +135,8 @@ upstream.finalize:
upstream.rebase:
scripts/upstream.sh "$@" start_rebase

bin/pulumi-java-gen:
pulumictl download-binary -n pulumi-language-java -v $(JAVA_GEN_VERSION) -r pulumi/pulumi-java
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

# To make an immediately observable change to .ci-mgmt.yaml:
#
Expand Down
Loading