Fix restoring progress in custom jobs

- Restore makefile progress - Use local shared actions for downloading bin and SDK assets.
pulumi · Nov 26, 2024 · 37e155b · 37e155b
1 parent 08b4850
commit 37e155b
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 73 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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