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 8e486381..2be2d739 100644 --- a/.github/workflows/build_sdk.yml +++ b/.github/workflows/build_sdk.yml @@ -52,7 +52,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 6458a116..1211ee2f 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -137,10 +137,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: @@ -148,6 +149,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 c5729603..e913f539 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -82,7 +82,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 76e81098..2cde165c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -113,7 +113,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 7e06ab51..616553df 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -87,7 +87,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 a43286b1..d0328e92 100644 --- a/.github/workflows/resync-build.yml +++ b/.github/workflows/resync-build.yml @@ -38,7 +38,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 68fef249..d25575a8 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -123,7 +123,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 051b3431..55d265c5 100644 --- a/.github/workflows/verify-release.yml +++ b/.github/workflows/verify-release.yml @@ -69,4 +69,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 7ef1e65b..00000000 --- a/.goreleaser.prerelease.yml +++ /dev/null @@ -1,43 +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-vault - 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: [] - ldflags: - - -X github.com/pulumi/pulumi-vault/provider/v6/pkg/version.Version={{.Tag}} - main: ./cmd/pulumi-resource-vault/ -changelog: - skip: true -release: - disable: true -snapshot: - name_template: "{{ .Tag }}-SNAPSHOT" -project_name: "pulumi-vault" diff --git a/.goreleaser.yml b/.goreleaser.yml deleted file mode 100644 index 5d345993..00000000 --- a/.goreleaser.yml +++ /dev/null @@ -1,51 +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-vault - 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: [] - ldflags: - - -X github.com/pulumi/pulumi-vault/provider/v6/pkg/version.Version={{.Tag}} - main: ./cmd/pulumi-resource-vault/ -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-vault" diff --git a/Makefile b/Makefile index cfdc5259..d834e2d5 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: