diff --git a/.ci-mgmt.yaml b/.ci-mgmt.yaml index 8d17042f274..eae6d9c3eac 100644 --- a/.ci-mgmt.yaml +++ b/.ci-mgmt.yaml @@ -228,26 +228,17 @@ extraTests: tools: pulumictl, pulumi, go, node, dotnet, python, java - name: Prepare local workspace run: make prepare_local_workspace - - name: Download provider + tfgen binaries - uses: actions/download-artifact@v4 - with: - name: aws-provider.tar.gz - path: ${{ github.workspace }}/bin - - name: Untar provider binaries - run: >- - tar -zxf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ - github.workspace}}/bin - - find ${{ github.workspace }} -name "pulumi-*-aws" -print -exec chmod +x {} \; - - run: dotnet nuget add source ${{ github.workspace }}/nuget + - name: Download bin + uses: ./.github/actions/download-bin - name: Download SDK + uses: ./.github/actions/download-sdk + with: + language: ${{ matrix.language }} + - name: Restore makefile progress uses: actions/download-artifact@v4 with: - name: ${{ matrix.language }}-sdk.tar.gz - path: ${{ github.workspace}}/sdk/ - - name: Uncompress SDK folder - run: tar -zxf ${{ github.workspace }}/sdk/${{ matrix.language }}.tar.gz -C ${{ - github.workspace }}/sdk/${{ matrix.language }} + name: build_${{ matrix.language }}.make + path: .make - name: Update path run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH" - name: Install Python deps diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 0047215aac7..1688d499522 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -266,23 +266,17 @@ jobs: tools: pulumictl, pulumi, go, node, dotnet, python, java - name: Prepare local workspace run: make prepare_local_workspace - - name: Download provider + tfgen binaries - uses: actions/download-artifact@v4 - with: - name: aws-provider.tar.gz - path: ${{ github.workspace }}/bin - - name: Untar provider binaries - run: |- - tar -zxf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ github.workspace}}/bin - find ${{ github.workspace }} -name "pulumi-*-aws" -print -exec chmod +x {} \; - - run: dotnet nuget add source ${{ github.workspace }}/nuget + - name: Download bin + uses: ./.github/actions/download-bin - name: Download SDK + uses: ./.github/actions/download-sdk + with: + language: ${{ matrix.language }} + - name: Restore makefile progress uses: actions/download-artifact@v4 with: - name: ${{ matrix.language }}-sdk.tar.gz - path: ${{ github.workspace}}/sdk/ - - name: Uncompress SDK folder - run: tar -zxf ${{ github.workspace }}/sdk/${{ matrix.language }}.tar.gz -C ${{ github.workspace }}/sdk/${{ matrix.language }} + name: build_${{ matrix.language }}.make + path: .make - name: Update path run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH" - name: Install Python deps diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 402d714f882..3154bc0a40d 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -207,23 +207,17 @@ jobs: tools: pulumictl, pulumi, go, node, dotnet, python, java - name: Prepare local workspace run: make prepare_local_workspace - - name: Download provider + tfgen binaries - uses: actions/download-artifact@v4 - with: - name: aws-provider.tar.gz - path: ${{ github.workspace }}/bin - - name: Untar provider binaries - run: |- - tar -zxf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ github.workspace}}/bin - find ${{ github.workspace }} -name "pulumi-*-aws" -print -exec chmod +x {} \; - - run: dotnet nuget add source ${{ github.workspace }}/nuget + - name: Download bin + uses: ./.github/actions/download-bin - name: Download SDK + uses: ./.github/actions/download-sdk + with: + language: ${{ matrix.language }} + - name: Restore makefile progress uses: actions/download-artifact@v4 with: - name: ${{ matrix.language }}-sdk.tar.gz - path: ${{ github.workspace}}/sdk/ - - name: Uncompress SDK folder - run: tar -zxf ${{ github.workspace }}/sdk/${{ matrix.language }}.tar.gz -C ${{ github.workspace }}/sdk/${{ matrix.language }} + name: build_${{ matrix.language }}.make + path: .make - name: Update path run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH" - name: Install Python deps diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0ddf4d6ddef..a985e614793 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -213,23 +213,17 @@ jobs: tools: pulumictl, pulumi, go, node, dotnet, python, java - name: Prepare local workspace run: make prepare_local_workspace - - name: Download provider + tfgen binaries - uses: actions/download-artifact@v4 - with: - name: aws-provider.tar.gz - path: ${{ github.workspace }}/bin - - name: Untar provider binaries - run: |- - tar -zxf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ github.workspace}}/bin - find ${{ github.workspace }} -name "pulumi-*-aws" -print -exec chmod +x {} \; - - run: dotnet nuget add source ${{ github.workspace }}/nuget + - name: Download bin + uses: ./.github/actions/download-bin - name: Download SDK + uses: ./.github/actions/download-sdk + with: + language: ${{ matrix.language }} + - name: Restore makefile progress uses: actions/download-artifact@v4 with: - name: ${{ matrix.language }}-sdk.tar.gz - path: ${{ github.workspace}}/sdk/ - - name: Uncompress SDK folder - run: tar -zxf ${{ github.workspace }}/sdk/${{ matrix.language }}.tar.gz -C ${{ github.workspace }}/sdk/${{ matrix.language }} + name: build_${{ matrix.language }}.make + path: .make - name: Update path run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH" - name: Install Python deps diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index 637a1f28237..9b6525f041a 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -268,23 +268,17 @@ jobs: tools: pulumictl, pulumi, go, node, dotnet, python, java - name: Prepare local workspace run: make prepare_local_workspace - - name: Download provider + tfgen binaries - uses: actions/download-artifact@v4 - with: - name: aws-provider.tar.gz - path: ${{ github.workspace }}/bin - - name: Untar provider binaries - run: |- - tar -zxf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ github.workspace}}/bin - find ${{ github.workspace }} -name "pulumi-*-aws" -print -exec chmod +x {} \; - - run: dotnet nuget add source ${{ github.workspace }}/nuget + - name: Download bin + uses: ./.github/actions/download-bin - name: Download SDK + uses: ./.github/actions/download-sdk + with: + language: ${{ matrix.language }} + - name: Restore makefile progress uses: actions/download-artifact@v4 with: - name: ${{ matrix.language }}-sdk.tar.gz - path: ${{ github.workspace}}/sdk/ - - name: Uncompress SDK folder - run: tar -zxf ${{ github.workspace }}/sdk/${{ matrix.language }}.tar.gz -C ${{ github.workspace }}/sdk/${{ matrix.language }} + name: build_${{ matrix.language }}.make + path: .make - name: Update path run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH" - name: Install Python deps