[internal] Update GitHub Actions workflow files

pulumi · Nov 26, 2024 · a0413aa · a0413aa
1 parent 7cc01da
commit a0413aa
Show file tree

Hide file tree

Showing 9 changed files with 250 additions and 120 deletions.
diff --git a/.github/workflows/build_provider.yml b/.github/workflows/build_provider.yml
@@ -37,6 +37,8 @@ jobs:
         uses: ./.github/actions/setup-tools
         with:
           tools: pulumictl, go
+      - name: Prepare local workspace before restoring previously built
+        run: make prepare_local_workspace
       - name: Download schema-embed.json
         uses: actions/download-artifact@v4
         with:
@@ -45,9 +47,11 @@ jobs:
           # Avoid creating directories for each artifact
           merge-multiple: true
           path: provider/cmd/pulumi-resource-postgresql/schema-embed.json
-      - name: Prepare for build
-        # This installs plugins and prepares upstream
-        run: make upstream
+      - name: Restore makefile progress
+        uses: actions/download-artifact@v4
+        with:
+          name: prerequisites.make
+          path: .make
       - name: Build & package provider
         run: make provider_dist-${{ matrix.platform.os }}-${{ matrix.platform.arch }}
       - name: Upload artifacts

diff --git a/.github/workflows/build_sdk.yml b/.github/workflows/build_sdk.yml
@@ -54,12 +54,17 @@ jobs:
         uses: ./.github/actions/setup-tools
         with:
           tools: pulumictl, pulumicli, ${{ matrix.language }}
+      - name: Prepare local workspace
+        run: make prepare_local_workspace
       - name: Download bin
         uses: ./.github/actions/download-bin
-      - name: Install plugins
-        run: make install_plugins
       - name: Update path
         run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
+      - name: Restore makefile progress
+        uses: actions/download-artifact@v4
+        with:
+          name: prerequisites.make
+          path: .make
       - name: Build SDK
         run: make build_${{ matrix.language }}
       - name: Check worktree clean
@@ -75,3 +80,9 @@ jobs:
         uses: ./.github/actions/upload-sdk
         with:
           language: ${{ matrix.language }}
+      - name: Save makefile progress
+        uses: actions/upload-artifact@v4
+        with:
+          name: build_${{ matrix.language }}.make
+          path: .make
+          include-hidden-files: true
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -144,15 +144,19 @@ jobs:
       uses: ./.github/actions/setup-tools
       with:
         tools: pulumictl, pulumicli, ${{ matrix.language }}
+    - name: Prepare local workspace
+      run: make prepare_local_workspace
     - name: Download bin
       uses: ./.github/actions/download-bin
-    - name: Add NuGet source
-      if: matrix.language == 'dotnet'
-      run: dotnet nuget add source ${{ github.workspace }}/nuget
     - name: Download SDK
       uses: ./.github/actions/download-sdk
       with:
         language: ${{ matrix.language }}
+    - name: Restore makefile progress
+      uses: actions/download-artifact@v4
+      with:
+        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
@@ -86,15 +86,19 @@ jobs:
       uses: ./.github/actions/setup-tools
       with:
         tools: pulumictl, pulumicli, nodejs, python, dotnet, go, java
+    - name: Prepare local workspace
+      run: make prepare_local_workspace
     - name: Download bin
       uses: ./.github/actions/download-bin
-    - name: Add NuGet source
-      if: matrix.language == 'dotnet'
-      run: dotnet nuget add source ${{ github.workspace }}/nuget
     - name: Download SDK
       uses: ./.github/actions/download-sdk
       with:
         language: ${{ matrix.language }}
+    - name: Restore makefile progress
+      uses: actions/download-artifact@v4
+      with:
+        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/prerequisites.yml b/.github/workflows/prerequisites.yml
@@ -56,20 +56,16 @@ jobs:
         path: |
           .pulumi/examples-cache
         key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }}
-    - name: Prepare upstream code
-      run: make upstream
     - name: Setup tools
       uses: ./.github/actions/setup-tools
       with:
         tools: go, pulumictl, pulumicli, schema-tools
-    - name: Build schema generator binary
-      run: make tfgen_build_only
-    - name: Install plugins
-      run: make install_plugins
+    - name: Prepare local workspace before restoring previously built files
+      run: make prepare_local_workspace
     - name: Generate schema
-      run: make tfgen_no_deps
+      run: make schema
     - name: Build provider binary
-      run: make provider_no_deps
+      run: make provider
     - name: Unit-test provider code
       run: make test_provider
     - if: inputs.is_pr
@@ -81,6 +77,12 @@ jobs:
           schema-tools compare -r github://api.github.com/pulumi -p postgresql -o "${{ inputs.default_branch }}" -n --local-path=provider/cmd/pulumi-resource-postgresql/schema.json;
           echo "$EOF";
         } >> "$GITHUB_ENV"
+    - name: Save makefile progress
+      uses: actions/upload-artifact@v4
+      with:
+        name: prerequisites.make
+        path: .make
+        include-hidden-files: true
     - if: inputs.is_pr && inputs.is_automated == false
       name: Comment on PR with Details of Schema Check
       uses: thollander/actions-comment-pull-request@v2

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -92,15 +92,19 @@ jobs:
       uses: ./.github/actions/setup-tools
       with:
         tools: pulumictl, pulumicli, ${{ matrix.language }}
+    - name: Prepare local workspace
+      run: make prepare_local_workspace
     - name: Download bin
       uses: ./.github/actions/download-bin
-    - name: Add NuGet source
-      if: matrix.language == 'dotnet'
-      run: dotnet nuget add source ${{ github.workspace }}/nuget
     - name: Download SDK
       uses: ./.github/actions/download-sdk
       with:
         language: ${{ matrix.language }}
+    - name: Restore makefile progress
+      uses: actions/download-artifact@v4
+      with:
+        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
@@ -141,15 +141,19 @@ jobs:
       uses: ./.github/actions/setup-tools
       with:
         tools: pulumictl, pulumicli, ${{ matrix.language }}
+    - name: Prepare local workspace
+      run: make prepare_local_workspace
     - name: Download bin
       uses: ./.github/actions/download-bin
-    - name: Add NuGet source
-      if: matrix.language == 'dotnet'
-      run: dotnet nuget add source ${{ github.workspace }}/nuget
     - name: Download SDK
       uses: ./.github/actions/download-sdk
       with:
         language: ${{ matrix.language }}
+    - name: Restore makefile progress
+      uses: actions/download-artifact@v4
+      with:
+        name: build_${{ matrix.language }}.make
+        path: .make
     - name: Update path
       run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
     - name: Install Python deps

diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,7 @@ sdk/java/gradlew.bat
 
 
 sdk/python/venv
+
+
+# Ignore local build tracking directory
+.make
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,3 +30,7 @@ sdk/java/gradlew.bat


		sdk/python/venv


		# Ignore local build tracking directory
		.make