From b9ae5cba33f0e206e3f2979438feac00e0a967b6 Mon Sep 17 00:00:00 2001 From: Ringo De Smet Date: Wed, 21 Aug 2024 14:53:24 +0200 Subject: [PATCH 1/4] Fix code block annotation --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 79c840f5f2..b3c40d6574 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Sometimes, you want those changes NOW rather than having to wait for a GitHub PR This example command will generate workflows for pulumi-datadog, and place them in the specified `--out` directory. Adjust for your provider and filesystem. -``` +```bash ./bin/provider-ci generate --name pulumi/pulumi-datadog --template bridged-provider --config ./providers/datadog/config.yaml --out ../../pulumi-dtadog ``` From 06d7162225f0269fdd14f5df1c5a93760854c6fc Mon Sep 17 00:00:00 2001 From: Ringo De Smet Date: Tue, 27 Aug 2024 11:42:09 +0200 Subject: [PATCH 2/4] Pass the configured organization name --- .../templates/bridged-provider/.github/workflows/publish.yml | 2 +- provider-ci/internal/pkg/templates/provider/.golangci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/publish.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/publish.yml index 92ee0eebd1..1997b8396a 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/publish.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/publish.yml @@ -67,7 +67,7 @@ jobs: shell: bash run: | # Get latest stable release. Return only first column from result (tag). - LAST_VERSION=$(gh release view --repo pulumi/pulumi-#{{ .Config.provider }}# --json tagName -q .tagName || echo "No stable release" ) + LAST_VERSION=$(gh release view --repo #{{ .Config.organization }}#/pulumi-#{{ .Config.provider }}# --json tagName -q .tagName || echo "No stable release" ) { echo 'summary< Date: Wed, 28 Aug 2024 13:23:08 +0200 Subject: [PATCH 3/4] Ability to configure the set of language SDKs Changing `node` to `nodejs` in tool installation task This brings consistency with the name of the language used in the GHA `language` build matrix --- .../pkg/templates/bridged-provider.config.yaml | 10 +++++++++- .../bridged-provider/.github/workflows/build_sdk.yml | 8 ++------ .../bridged-provider/.github/workflows/main.yml | 10 ++++------ .../.github/workflows/nightly-test.yml | 8 ++------ .../.github/workflows/prerelease.yml | 6 +----- .../bridged-provider/.github/workflows/release.yml | 8 ++------ .../.github/workflows/run-acceptance-tests.yml | 8 ++------ .../internal/pkg/templates/bridged-provider/Makefile | 2 +- .../internal/pkg/templates/dev-container/devbox.json | 2 +- .../provider/.github/actions/setup-tools/action.yml | 6 +++--- .../aws/.github/actions/setup-tools/action.yml | 4 ++-- .../aws/.github/workflows/build_sdk.yml | 2 +- .../test-providers/aws/.github/workflows/master.yml | 4 +++- .../aws/.github/workflows/nightly-test.yml | 12 ++++++------ .../test-providers/aws/.github/workflows/release.yml | 2 +- .../aws/.github/workflows/run-acceptance-tests.yml | 2 +- provider-ci/test-providers/aws/Makefile | 2 +- .../.github/actions/setup-tools/action.yml | 4 ++-- .../cloudflare/.github/workflows/build_sdk.yml | 2 +- .../cloudflare/.github/workflows/master.yml | 4 +++- .../cloudflare/.github/workflows/release.yml | 2 +- .../.github/workflows/run-acceptance-tests.yml | 2 +- provider-ci/test-providers/cloudflare/Makefile | 2 +- .../docker/.github/actions/setup-tools/action.yml | 4 ++-- .../docker/.github/workflows/build_sdk.yml | 2 +- .../docker/.github/workflows/master.yml | 4 +++- .../docker/.github/workflows/release.yml | 2 +- .../.github/workflows/run-acceptance-tests.yml | 2 +- provider-ci/test-providers/docker/Makefile | 2 +- 29 files changed, 60 insertions(+), 68 deletions(-) diff --git a/provider-ci/internal/pkg/templates/bridged-provider.config.yaml b/provider-ci/internal/pkg/templates/bridged-provider.config.yaml index cdc5dfff07..8d4f1c9c84 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider.config.yaml +++ b/provider-ci/internal/pkg/templates/bridged-provider.config.yaml @@ -82,10 +82,18 @@ toolVersions: go: "1.21.x" java: "11" gradle: "7.6" - node: "20.x" + nodejs: "20.x" pulumi: "dev" python: "3.11.8" +# Control which language SDKs get built and published. +languages: + - nodejs + - python + - dotnet + - go + - java + # env contains an assortment of properties for different purposes. # Additional entries are added by individual providers for different reasons. # All jobs currently get the same env for all steps but values might only be used for very specific purposes. diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/build_sdk.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/build_sdk.yml index 111c144771..18bc33eaaf 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/build_sdk.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/build_sdk.yml @@ -19,11 +19,7 @@ jobs: fail-fast: true matrix: language: - - nodejs - - python - - dotnet - - go - - java +#{{ .Config.languages | toYaml | indent 8 }}# steps: #{{- if .Config.freeDiskSpaceBeforeSdkBuild }}# # Run as first step so we don't delete things that have just been installed @@ -48,7 +44,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, ${{ matrix.language }} - name: Download bin uses: ./.github/actions/download-bin - name: Install plugins diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/main.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/main.yml index 984353579a..264d2ec464 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/main.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/main.yml @@ -143,10 +143,11 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, ${{ matrix.language }} - name: Download bin uses: ./.github/actions/download-bin - run: dotnet nuget add source ${{ github.workspace }}/nuget + if: matrix.language == 'dotnet' - name: Download SDK uses: ./.github/actions/download-sdk with: @@ -154,6 +155,7 @@ jobs: - name: Update path run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH" - name: Install Python deps + if: matrix.language == 'python' run: |- pip3 install virtualenv==20.0.23 pip3 install pipenv @@ -225,11 +227,7 @@ jobs: fail-fast: false matrix: language: - - nodejs - - python - - dotnet - - go - - java +#{{ .Config.languages | toYaml | indent 8 }}# #{{- if .Config.extraTests }}# #{{ .Config.extraTests | toYaml | indent 2 }}# #{{ end }}# diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/nightly-test.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/nightly-test.yml index 1946d17a0a..b46a2c0119 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/nightly-test.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/nightly-test.yml @@ -56,7 +56,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, ${{ matrix.language}} - name: Download bin uses: ./.github/actions/download-bin - run: dotnet nuget add source ${{ github.workspace }}/nuget @@ -140,11 +140,7 @@ jobs: fail-fast: false matrix: language: - - nodejs - - python - - dotnet - - go - - java +#{{ .Config.languages | toYaml | indent 10 }}# name: cron on: schedule: diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml index fcab0577a7..4e487ba157 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml @@ -166,11 +166,7 @@ jobs: fail-fast: false matrix: language: - - nodejs - - python - - dotnet - - go - - java +#{{ .Config.languages | toYaml | indent 8 }}# #{{- if .Config.extraTests }}# #{{ .Config.extraTests | toYaml | indent 2 }}# #{{ end }}# diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/release.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/release.yml index 2dd75236bb..0f3ddc7e11 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/release.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/release.yml @@ -92,7 +92,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, ${{ matrix.language }} - name: Download bin uses: ./.github/actions/download-bin - run: dotnet nuget add source ${{ github.workspace }}/nuget @@ -174,11 +174,7 @@ jobs: fail-fast: false matrix: language: - - nodejs - - python - - dotnet - - go - - java +#{{ .Config.languages | toYaml | indent 8 }}# #{{- if .Config.extraTests }}# #{{ .Config.extraTests | toYaml | indent 2 }}# #{{ end }}# diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/run-acceptance-tests.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/run-acceptance-tests.yml index 664501abd7..1ae6cebfbd 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/run-acceptance-tests.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/run-acceptance-tests.yml @@ -126,7 +126,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, ${{ matrix.language }} - name: Download bin uses: ./.github/actions/download-bin - run: dotnet nuget add source ${{ github.workspace }}/nuget @@ -214,11 +214,7 @@ jobs: fail-fast: false matrix: language: - - nodejs - - python - - dotnet - - go - - java +#{{ .Config.languages | toYaml | indent 8 }}# #{{- if .Config.testPulumiExamples }}# testTarget: [local, pulumiExamples] #{{- else }}# diff --git a/provider-ci/internal/pkg/templates/bridged-provider/Makefile b/provider-ci/internal/pkg/templates/bridged-provider/Makefile index 5d949837b6..5d378966db 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/Makefile +++ b/provider-ci/internal/pkg/templates/bridged-provider/Makefile @@ -45,7 +45,7 @@ development: install_plugins provider build_sdks install_sdks build: install_plugins provider build_sdks install_sdks -build_sdks: build_nodejs build_python build_go build_dotnet build_java +build_sdks: #{{ range .Config.languages }}#build_#{{ . }}# #{{ end }}# install_go_sdk: diff --git a/provider-ci/internal/pkg/templates/dev-container/devbox.json b/provider-ci/internal/pkg/templates/dev-container/devbox.json index eaae29fbd7..1d81d0eb7c 100644 --- a/provider-ci/internal/pkg/templates/dev-container/devbox.json +++ b/provider-ci/internal/pkg/templates/dev-container/devbox.json @@ -6,7 +6,7 @@ "yarn@latest", "pulumictl@latest", "go@#{{ trimAll "x" .Config.toolVersions.go }}#", - "nodejs@#{{ trimAll "x" .Config.toolVersions.node }}#", + "nodejs@#{{ trimAll "x" .Config.toolVersions.nodejs }}#", "python3@#{{ trimAll "x" .Config.toolVersions.python }}#", "dotnet-sdk@#{{ trimAll "x" .Config.toolVersions.dotnet }}#", "gradle_7@#{{ trimAll "x" .Config.toolVersions.gradle }}#", diff --git a/provider-ci/internal/pkg/templates/provider/.github/actions/setup-tools/action.yml b/provider-ci/internal/pkg/templates/provider/.github/actions/setup-tools/action.yml index 4634f20b0b..2834b14520 100644 --- a/provider-ci/internal/pkg/templates/provider/.github/actions/setup-tools/action.yml +++ b/provider-ci/internal/pkg/templates/provider/.github/actions/setup-tools/action.yml @@ -9,7 +9,7 @@ inputs: pulumicli pulumictl schema-tools - node + nodejs python dotnet java @@ -48,10 +48,10 @@ runs: repo: pulumi/schema-tools - name: Setup Node - if: inputs.tools == 'all' || contains(inputs.tools, 'node') + if: inputs.tools == 'all' || contains(inputs.tools, 'nodejs') uses: actions/setup-node@v4 with: - node-version: #{{ .Config.toolVersions.node }}# + node-version: #{{ .Config.toolVersions.nodejs }}# registry-url: https://registry.npmjs.org - name: Setup DotNet diff --git a/provider-ci/test-providers/aws/.github/actions/setup-tools/action.yml b/provider-ci/test-providers/aws/.github/actions/setup-tools/action.yml index ec2dddec60..642d1d223f 100644 --- a/provider-ci/test-providers/aws/.github/actions/setup-tools/action.yml +++ b/provider-ci/test-providers/aws/.github/actions/setup-tools/action.yml @@ -9,7 +9,7 @@ inputs: pulumicli pulumictl schema-tools - node + nodejs python dotnet java @@ -48,7 +48,7 @@ runs: repo: pulumi/schema-tools - name: Setup Node - if: inputs.tools == 'all' || contains(inputs.tools, 'node') + if: inputs.tools == 'all' || contains(inputs.tools, 'nodejs') uses: actions/setup-node@v4 with: node-version: 20.x diff --git a/provider-ci/test-providers/aws/.github/workflows/build_sdk.yml b/provider-ci/test-providers/aws/.github/workflows/build_sdk.yml index 86f1b6e744..4270edb5a2 100644 --- a/provider-ci/test-providers/aws/.github/workflows/build_sdk.yml +++ b/provider-ci/test-providers/aws/.github/workflows/build_sdk.yml @@ -62,7 +62,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, ${{ matrix.language }} - name: Download bin uses: ./.github/actions/download-bin - name: Install plugins diff --git a/provider-ci/test-providers/aws/.github/workflows/master.yml b/provider-ci/test-providers/aws/.github/workflows/master.yml index f77eac7d9d..4302c38652 100644 --- a/provider-ci/test-providers/aws/.github/workflows/master.yml +++ b/provider-ci/test-providers/aws/.github/workflows/master.yml @@ -149,10 +149,11 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, ${{ matrix.language }} - name: Download bin uses: ./.github/actions/download-bin - run: dotnet nuget add source ${{ github.workspace }}/nuget + if: matrix.language == 'dotnet' - name: Download SDK uses: ./.github/actions/download-sdk with: @@ -160,6 +161,7 @@ jobs: - name: Update path run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH" - name: Install Python deps + if: matrix.language == 'python' run: |- pip3 install virtualenv==20.0.23 pip3 install pipenv diff --git a/provider-ci/test-providers/aws/.github/workflows/nightly-test.yml b/provider-ci/test-providers/aws/.github/workflows/nightly-test.yml index 1d8684f305..beb3b23b06 100644 --- a/provider-ci/test-providers/aws/.github/workflows/nightly-test.yml +++ b/provider-ci/test-providers/aws/.github/workflows/nightly-test.yml @@ -69,7 +69,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, ${{ matrix.language}} - name: Download bin uses: ./.github/actions/download-bin - run: dotnet nuget add source ${{ github.workspace }}/nuget @@ -108,11 +108,11 @@ jobs: fail-fast: false matrix: language: - - nodejs - - python - - dotnet - - go - - java + - nodejs + - python + - dotnet + - go + - java name: cron on: schedule: diff --git a/provider-ci/test-providers/aws/.github/workflows/release.yml b/provider-ci/test-providers/aws/.github/workflows/release.yml index 4109f921b6..1e3e3be862 100644 --- a/provider-ci/test-providers/aws/.github/workflows/release.yml +++ b/provider-ci/test-providers/aws/.github/workflows/release.yml @@ -97,7 +97,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, ${{ matrix.language }} - name: Download bin uses: ./.github/actions/download-bin - run: dotnet nuget add source ${{ github.workspace }}/nuget diff --git a/provider-ci/test-providers/aws/.github/workflows/run-acceptance-tests.yml b/provider-ci/test-providers/aws/.github/workflows/run-acceptance-tests.yml index 1208fddfa4..2a30696ddf 100644 --- a/provider-ci/test-providers/aws/.github/workflows/run-acceptance-tests.yml +++ b/provider-ci/test-providers/aws/.github/workflows/run-acceptance-tests.yml @@ -129,7 +129,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, ${{ matrix.language }} - name: Download bin uses: ./.github/actions/download-bin - run: dotnet nuget add source ${{ github.workspace }}/nuget diff --git a/provider-ci/test-providers/aws/Makefile b/provider-ci/test-providers/aws/Makefile index da3a3e2a6c..d5c1c884b2 100644 --- a/provider-ci/test-providers/aws/Makefile +++ b/provider-ci/test-providers/aws/Makefile @@ -29,7 +29,7 @@ development: install_plugins provider build_sdks install_sdks build: install_plugins provider build_sdks install_sdks -build_sdks: build_nodejs build_python build_go build_dotnet build_java +build_sdks: build_nodejs build_python build_dotnet build_go build_java install_go_sdk: diff --git a/provider-ci/test-providers/cloudflare/.github/actions/setup-tools/action.yml b/provider-ci/test-providers/cloudflare/.github/actions/setup-tools/action.yml index ec2dddec60..642d1d223f 100644 --- a/provider-ci/test-providers/cloudflare/.github/actions/setup-tools/action.yml +++ b/provider-ci/test-providers/cloudflare/.github/actions/setup-tools/action.yml @@ -9,7 +9,7 @@ inputs: pulumicli pulumictl schema-tools - node + nodejs python dotnet java @@ -48,7 +48,7 @@ runs: repo: pulumi/schema-tools - name: Setup Node - if: inputs.tools == 'all' || contains(inputs.tools, 'node') + if: inputs.tools == 'all' || contains(inputs.tools, 'nodejs') uses: actions/setup-node@v4 with: node-version: 20.x diff --git a/provider-ci/test-providers/cloudflare/.github/workflows/build_sdk.yml b/provider-ci/test-providers/cloudflare/.github/workflows/build_sdk.yml index 36b673fd54..409adc6fa8 100644 --- a/provider-ci/test-providers/cloudflare/.github/workflows/build_sdk.yml +++ b/provider-ci/test-providers/cloudflare/.github/workflows/build_sdk.yml @@ -53,7 +53,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, ${{ matrix.language }} - name: Download bin uses: ./.github/actions/download-bin - name: Install plugins diff --git a/provider-ci/test-providers/cloudflare/.github/workflows/master.yml b/provider-ci/test-providers/cloudflare/.github/workflows/master.yml index c89bd645b7..6cb76b363d 100644 --- a/provider-ci/test-providers/cloudflare/.github/workflows/master.yml +++ b/provider-ci/test-providers/cloudflare/.github/workflows/master.yml @@ -138,10 +138,11 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, ${{ matrix.language }} - name: Download bin uses: ./.github/actions/download-bin - run: dotnet nuget add source ${{ github.workspace }}/nuget + if: matrix.language == 'dotnet' - name: Download SDK uses: ./.github/actions/download-sdk with: @@ -149,6 +150,7 @@ jobs: - name: Update path run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH" - name: Install Python deps + if: matrix.language == 'python' run: |- pip3 install virtualenv==20.0.23 pip3 install pipenv diff --git a/provider-ci/test-providers/cloudflare/.github/workflows/release.yml b/provider-ci/test-providers/cloudflare/.github/workflows/release.yml index 8610de9deb..45d1497468 100644 --- a/provider-ci/test-providers/cloudflare/.github/workflows/release.yml +++ b/provider-ci/test-providers/cloudflare/.github/workflows/release.yml @@ -88,7 +88,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, ${{ matrix.language }} - name: Download bin uses: ./.github/actions/download-bin - run: dotnet nuget add source ${{ github.workspace }}/nuget diff --git a/provider-ci/test-providers/cloudflare/.github/workflows/run-acceptance-tests.yml b/provider-ci/test-providers/cloudflare/.github/workflows/run-acceptance-tests.yml index e63ffa76a0..b2bf45cd1b 100644 --- a/provider-ci/test-providers/cloudflare/.github/workflows/run-acceptance-tests.yml +++ b/provider-ci/test-providers/cloudflare/.github/workflows/run-acceptance-tests.yml @@ -124,7 +124,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, ${{ matrix.language }} - name: Download bin uses: ./.github/actions/download-bin - run: dotnet nuget add source ${{ github.workspace }}/nuget diff --git a/provider-ci/test-providers/cloudflare/Makefile b/provider-ci/test-providers/cloudflare/Makefile index 42d9681d51..99efd860a4 100644 --- a/provider-ci/test-providers/cloudflare/Makefile +++ b/provider-ci/test-providers/cloudflare/Makefile @@ -29,7 +29,7 @@ development: install_plugins provider build_sdks install_sdks build: install_plugins provider build_sdks install_sdks -build_sdks: build_nodejs build_python build_go build_dotnet build_java +build_sdks: build_nodejs build_python build_dotnet build_go build_java install_go_sdk: diff --git a/provider-ci/test-providers/docker/.github/actions/setup-tools/action.yml b/provider-ci/test-providers/docker/.github/actions/setup-tools/action.yml index ec2dddec60..642d1d223f 100644 --- a/provider-ci/test-providers/docker/.github/actions/setup-tools/action.yml +++ b/provider-ci/test-providers/docker/.github/actions/setup-tools/action.yml @@ -9,7 +9,7 @@ inputs: pulumicli pulumictl schema-tools - node + nodejs python dotnet java @@ -48,7 +48,7 @@ runs: repo: pulumi/schema-tools - name: Setup Node - if: inputs.tools == 'all' || contains(inputs.tools, 'node') + if: inputs.tools == 'all' || contains(inputs.tools, 'nodejs') uses: actions/setup-node@v4 with: node-version: 20.x diff --git a/provider-ci/test-providers/docker/.github/workflows/build_sdk.yml b/provider-ci/test-providers/docker/.github/workflows/build_sdk.yml index 45fa494e3e..f458907080 100644 --- a/provider-ci/test-providers/docker/.github/workflows/build_sdk.yml +++ b/provider-ci/test-providers/docker/.github/workflows/build_sdk.yml @@ -66,7 +66,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, ${{ matrix.language }} - name: Download bin uses: ./.github/actions/download-bin - name: Install plugins diff --git a/provider-ci/test-providers/docker/.github/workflows/master.yml b/provider-ci/test-providers/docker/.github/workflows/master.yml index 34df5b99a6..1745ea6f07 100644 --- a/provider-ci/test-providers/docker/.github/workflows/master.yml +++ b/provider-ci/test-providers/docker/.github/workflows/master.yml @@ -151,10 +151,11 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, ${{ matrix.language }} - name: Download bin uses: ./.github/actions/download-bin - run: dotnet nuget add source ${{ github.workspace }}/nuget + if: matrix.language == 'dotnet' - name: Download SDK uses: ./.github/actions/download-sdk with: @@ -162,6 +163,7 @@ jobs: - name: Update path run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH" - name: Install Python deps + if: matrix.language == 'python' run: |- pip3 install virtualenv==20.0.23 pip3 install pipenv diff --git a/provider-ci/test-providers/docker/.github/workflows/release.yml b/provider-ci/test-providers/docker/.github/workflows/release.yml index d6c537a5f2..a1fa437ef5 100644 --- a/provider-ci/test-providers/docker/.github/workflows/release.yml +++ b/provider-ci/test-providers/docker/.github/workflows/release.yml @@ -101,7 +101,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, ${{ matrix.language }} - name: Download bin uses: ./.github/actions/download-bin - run: dotnet nuget add source ${{ github.workspace }}/nuget diff --git a/provider-ci/test-providers/docker/.github/workflows/run-acceptance-tests.yml b/provider-ci/test-providers/docker/.github/workflows/run-acceptance-tests.yml index 22f4ab356d..28e7a629e6 100644 --- a/provider-ci/test-providers/docker/.github/workflows/run-acceptance-tests.yml +++ b/provider-ci/test-providers/docker/.github/workflows/run-acceptance-tests.yml @@ -137,7 +137,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, ${{ matrix.language }} - name: Download bin uses: ./.github/actions/download-bin - run: dotnet nuget add source ${{ github.workspace }}/nuget diff --git a/provider-ci/test-providers/docker/Makefile b/provider-ci/test-providers/docker/Makefile index fdd25c26d8..c192692e99 100644 --- a/provider-ci/test-providers/docker/Makefile +++ b/provider-ci/test-providers/docker/Makefile @@ -29,7 +29,7 @@ development: install_plugins provider build_sdks install_sdks build: install_plugins provider build_sdks install_sdks -build_sdks: build_nodejs build_python build_go build_dotnet build_java +build_sdks: build_nodejs build_python build_dotnet build_go build_java install_go_sdk: From 36c1eb1b67ecf71be6fc82f2cbd8e90343b2b6e0 Mon Sep 17 00:00:00 2001 From: Ringo De Smet Date: Mon, 9 Sep 2024 15:38:46 +0200 Subject: [PATCH 4/4] Use `languages` in (pre)release. --- .../templates/bridged-provider/.github/workflows/prerelease.yml | 2 +- .../templates/bridged-provider/.github/workflows/publish.yml | 2 +- provider-ci/test-providers/aws/.github/workflows/prerelease.yml | 2 +- provider-ci/test-providers/aws/.github/workflows/publish.yml | 2 +- .../test-providers/cloudflare/.github/workflows/prerelease.yml | 2 +- .../test-providers/cloudflare/.github/workflows/publish.yml | 2 +- .../test-providers/docker/.github/workflows/prerelease.yml | 2 +- provider-ci/test-providers/docker/.github/workflows/publish.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml index 4e487ba157..83d076b4d8 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml @@ -84,7 +84,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, #{{ range $index, $element := .Config.languages }}##{{if $index}}#, #{{end}}##{{ $element }}##{{end}}# - name: Download bin uses: ./.github/actions/download-bin - run: dotnet nuget add source ${{ github.workspace }}/nuget diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/publish.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/publish.yml index 1997b8396a..886aebd635 100644 --- a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/publish.yml +++ b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/publish.yml @@ -105,7 +105,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, #{{ range $index, $element := .Config.languages }}##{{if $index}}#, #{{end}}##{{ $element }}##{{end}}# - name: Publish SDKs uses: pulumi/pulumi-package-publisher@v0.0.20 with: diff --git a/provider-ci/test-providers/aws/.github/workflows/prerelease.yml b/provider-ci/test-providers/aws/.github/workflows/prerelease.yml index 9ad63bcbf0..fe1a232293 100644 --- a/provider-ci/test-providers/aws/.github/workflows/prerelease.yml +++ b/provider-ci/test-providers/aws/.github/workflows/prerelease.yml @@ -92,7 +92,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, nodejs, python, dotnet, go, java - name: Download bin uses: ./.github/actions/download-bin - run: dotnet nuget add source ${{ github.workspace }}/nuget diff --git a/provider-ci/test-providers/aws/.github/workflows/publish.yml b/provider-ci/test-providers/aws/.github/workflows/publish.yml index 615f201f7d..92aa0dbc97 100644 --- a/provider-ci/test-providers/aws/.github/workflows/publish.yml +++ b/provider-ci/test-providers/aws/.github/workflows/publish.yml @@ -119,7 +119,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, nodejs, python, dotnet, go, java - name: Publish SDKs uses: pulumi/pulumi-package-publisher@v0.0.20 with: diff --git a/provider-ci/test-providers/cloudflare/.github/workflows/prerelease.yml b/provider-ci/test-providers/cloudflare/.github/workflows/prerelease.yml index 657854b94f..c27ff6cf1e 100644 --- a/provider-ci/test-providers/cloudflare/.github/workflows/prerelease.yml +++ b/provider-ci/test-providers/cloudflare/.github/workflows/prerelease.yml @@ -83,7 +83,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, nodejs, python, dotnet, go, java - name: Download bin uses: ./.github/actions/download-bin - run: dotnet nuget add source ${{ github.workspace }}/nuget diff --git a/provider-ci/test-providers/cloudflare/.github/workflows/publish.yml b/provider-ci/test-providers/cloudflare/.github/workflows/publish.yml index 6115c279e1..dbfe6e92c9 100644 --- a/provider-ci/test-providers/cloudflare/.github/workflows/publish.yml +++ b/provider-ci/test-providers/cloudflare/.github/workflows/publish.yml @@ -114,7 +114,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, nodejs, python, dotnet, go, java - name: Publish SDKs uses: pulumi/pulumi-package-publisher@v0.0.20 with: diff --git a/provider-ci/test-providers/docker/.github/workflows/prerelease.yml b/provider-ci/test-providers/docker/.github/workflows/prerelease.yml index e6c311d737..17beb2e084 100644 --- a/provider-ci/test-providers/docker/.github/workflows/prerelease.yml +++ b/provider-ci/test-providers/docker/.github/workflows/prerelease.yml @@ -96,7 +96,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, nodejs, python, dotnet, go, java - name: Download bin uses: ./.github/actions/download-bin - run: dotnet nuget add source ${{ github.workspace }}/nuget diff --git a/provider-ci/test-providers/docker/.github/workflows/publish.yml b/provider-ci/test-providers/docker/.github/workflows/publish.yml index ce01516d53..3e02a58a7b 100644 --- a/provider-ci/test-providers/docker/.github/workflows/publish.yml +++ b/provider-ci/test-providers/docker/.github/workflows/publish.yml @@ -127,7 +127,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python, java + tools: pulumictl, pulumicli, nodejs, python, dotnet, go, java - name: Publish SDKs uses: pulumi/pulumi-package-publisher@v0.0.20 with: