From 26903bfc692b7c0d4a6d728d778f53c1267d5876 Mon Sep 17 00:00:00 2001 From: Pulumi Bot Date: Wed, 11 Sep 2024 05:42:48 +0000 Subject: [PATCH] [internal] Update GitHub Actions workflow files --- .github/actions/setup-tools/action.yml | 4 +- .github/workflows/build_sdk.yml | 2 +- .github/workflows/master.yml | 4 +- .github/workflows/prerelease.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/resync-build.yml | 2 +- .github/workflows/run-acceptance-tests.yml | 2 +- .github/workflows/upgrade-bridge.yml | 2 +- .github/workflows/verify-release.yml | 2 +- .goreleaser.prerelease.yml | 45 ------------------ .goreleaser.yml | 53 ---------------------- Makefile | 2 +- 13 files changed, 14 insertions(+), 110 deletions(-) delete mode 100644 .goreleaser.prerelease.yml delete mode 100644 .goreleaser.yml diff --git a/.github/actions/setup-tools/action.yml b/.github/actions/setup-tools/action.yml index ec2dddec..642d1d22 100644 --- a/.github/actions/setup-tools/action.yml +++ b/.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/.github/workflows/build_sdk.yml b/.github/workflows/build_sdk.yml index fee342c6..87894c11 100644 --- a/.github/workflows/build_sdk.yml +++ b/.github/workflows/build_sdk.yml @@ -55,7 +55,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/.github/workflows/master.yml b/.github/workflows/master.yml index 5a3ddba9..0cb10a6b 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -140,10 +140,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: @@ -151,6 +152,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/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index b0113daa..185154f8 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -85,7 +85,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/.github/workflows/publish.yml b/.github/workflows/publish.yml index d1fbe955..4e3de78d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -116,7 +116,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/.github/workflows/release.yml b/.github/workflows/release.yml index f71517ee..3d71afb4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -90,7 +90,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/.github/workflows/resync-build.yml b/.github/workflows/resync-build.yml index 5e01f4bd..bab83eef 100644 --- a/.github/workflows/resync-build.yml +++ b/.github/workflows/resync-build.yml @@ -41,7 +41,7 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumictl, pulumicli, go, node, dotnet, python + tools: pulumictl, pulumicli, go, nodejs, dotnet, python - name: Sync with ci-mgmt run: cp -r "ci-mgmt/provider-ci/providers/$PROVIDER/repo/." . - name: Remove ci-mgmt directory diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index f98063f4..6c066bbd 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.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 diff --git a/.github/workflows/upgrade-bridge.yml b/.github/workflows/upgrade-bridge.yml index d302ae68..0c47364c 100644 --- a/.github/workflows/upgrade-bridge.yml +++ b/.github/workflows/upgrade-bridge.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, nodejs, python, dotnet, go, java - name: Call upgrade provider action if: github.event_name == 'workflow_dispatch' uses: pulumi/pulumi-upgrade-provider-action@v0.0.12 diff --git a/.github/workflows/verify-release.yml b/.github/workflows/verify-release.yml index a486550b..eeb29e2c 100644 --- a/.github/workflows/verify-release.yml +++ b/.github/workflows/verify-release.yml @@ -72,4 +72,4 @@ jobs: - name: Setup tools uses: ./.github/actions/setup-tools with: - tools: pulumicli, go, node, dotnet, python, java + tools: pulumicli, nodejs, python, dotnet, go, java diff --git a/.goreleaser.prerelease.yml b/.goreleaser.prerelease.yml deleted file mode 100644 index cf32f28b..00000000 --- a/.goreleaser.prerelease.yml +++ /dev/null @@ -1,45 +0,0 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt - -archives: -- id: archive - name_template: "{{ .Binary }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}" -before: - hooks: - - make tfgen -blobs: -- bucket: get.pulumi.com - folder: releases/plugins/ - ids: - - archive - provider: s3 - region: us-west-2 -builds: -- binary: pulumi-resource-minio - dir: provider - env: - - CGO_ENABLED=0 - - GO111MODULE=on - goarch: - - amd64 - - arm64 - goos: - - darwin - - windows - - linux - hooks: - post: - - env GOOS={{ .Os }} GOARCH={{ .Arch }} go clean -cache - - env GOOS={{ .Os }} GOARCH={{ .Arch }} go clean -modcache - ignore: - - goarch: arm64 - goos: windows - ldflags: - - -X github.com/pulumi/pulumi-minio/provider/pkg/version.Version={{.Tag}} - main: ./cmd/pulumi-resource-minio/ -changelog: - skip: true -release: - disable: true -snapshot: - name_template: "{{ .Tag }}-SNAPSHOT" -project_name: "pulumi-minio" diff --git a/.goreleaser.yml b/.goreleaser.yml deleted file mode 100644 index 7cee59f1..00000000 --- a/.goreleaser.yml +++ /dev/null @@ -1,53 +0,0 @@ -# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt - -archives: -- id: archive - name_template: "{{ .Binary }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}" -before: - hooks: - - make tfgen -blobs: -- bucket: get.pulumi.com - folder: releases/plugins/ - ids: - - archive - provider: s3 - region: us-west-2 -builds: -- binary: pulumi-resource-minio - dir: provider - env: - - CGO_ENABLED=0 - - GO111MODULE=on - goarch: - - amd64 - - arm64 - goos: - - darwin - - windows - - linux - hooks: - post: - - env GOOS={{ .Os }} GOARCH={{ .Arch }} go clean -cache - - env GOOS={{ .Os }} GOARCH={{ .Arch }} go clean -modcache - ignore: - - goarch: arm64 - goos: windows - ldflags: - - -X github.com/pulumi/pulumi-minio/provider/pkg/version.Version={{.Tag}} - main: ./cmd/pulumi-resource-minio/ -changelog: - filters: - exclude: - - Merge branch - - Merge pull request - - \Winternal\W - - \Wci\W - - \Wchore\W - sort: asc - use: git -release: - disable: false -snapshot: - name_template: "{{ .Tag }}-SNAPSHOT" -project_name: "pulumi-minio" diff --git a/Makefile b/Makefile index f39b6ea5..12a88744 100644 --- a/Makefile +++ b/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: