From f9f0ebfa572f0881a6382ac9daeb7974b71233f9 Mon Sep 17 00:00:00 2001 From: Pulumi Bot Date: Tue, 10 Sep 2024 09:16:12 +0000 Subject: [PATCH] [internal] Update GitHub Actions workflow files --- .github/actions/setup-tools/action.yml | 4 ++-- .github/workflows/build_sdk.yml | 2 +- .github/workflows/main.yml | 4 +++- .github/workflows/prerelease.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/run-acceptance-tests.yml | 2 +- Makefile | 2 +- 8 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/actions/setup-tools/action.yml b/.github/actions/setup-tools/action.yml index ec2ddde..642d1d2 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 34f49db..493f449 100644 --- a/.github/workflows/build_sdk.yml +++ b/.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/.github/workflows/main.yml b/.github/workflows/main.yml index 30fb576..3f12780 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.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/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 17544cb..5a4dcf4 100644 --- a/.github/workflows/prerelease.yml +++ b/.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/.github/workflows/publish.yml b/.github/workflows/publish.yml index cf225de..724bd73 100644 --- a/.github/workflows/publish.yml +++ b/.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/.github/workflows/release.yml b/.github/workflows/release.yml index 0e0c425..b8250cc 100644 --- a/.github/workflows/release.yml +++ b/.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/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index 08be9ce..2d339b3 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.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/Makefile b/Makefile index 06c5bdb..e142872 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: