Install tools package publishing (#1004)

Re-use our own tool setups which can include additional options for caching rather than duplicating the setup logic into the publishing action. This depends on first merging: - pulumi/pulumi-package-publisher#32 - #1003 This PR assumes that `pulumi/pulumi-package-publisher` will then be published as `v0.0.19` (the next version).
pulumi · Jun 27, 2024 · f8daeb9 · f8daeb9
1 parent f53f35b
commit f8daeb9
Show file tree

Hide file tree

Showing 13 changed files with 100 additions and 58 deletions.
diff --git a/provider-ci/internal/pkg/templates/bridged-provider.config.yaml b/provider-ci/internal/pkg/templates/bridged-provider.config.yaml
@@ -160,7 +160,7 @@ actionVersions:
 publish:
   # publisherAction is the version of the pulumi-package-publisher action to use.
   # This should be pinned to just the major version once v1 is released.
-  publisherAction: pulumi/[email protected].18
+  publisherAction: pulumi/[email protected].19
   # passed to the sdk input of pulumi-package-publisher
   # This is overridden in pulumi-local to disable python
   sdk: all

diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/main.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/main.yml
@@ -128,15 +128,21 @@ jobs:
       - publish
     runs-on: #{{ .Config.runner.default }}#
     steps:
+    - name: Checkout Repo
+      uses: #{{ .Config.actionVersions.checkout }}#
+#{{- if .Config.checkoutSubmodules }}#
+      with:
+        submodules: #{{ .Config.checkoutSubmodules }}#
+#{{- end }}#
+    - name: Setup tools
+      uses: ./.github/actions/setup-tools
+      with:
+        tools: pulumicli, pulumictl, go, node, dotnet, python, java
     - name: Publish SDKs
       uses: #{{ .Config.publish.publisherAction }}#
       with:
         sdk: #{{ .Config.publish.sdk }}#
         version: ${{ needs.prerequisites.outputs.version }}
-        dotnet-version: "#{{ .Config.toolVersions.dotnet }}#"
-        java-version: "#{{ .Config.toolVersions.java }}#"
-        node-version: "#{{ .Config.toolVersions.node }}#"
-        python-version: "#{{ .Config.toolVersions.python }}#"
 
   tag_release_if_labeled_needs_release:
     name: Tag release if labeled as needs-release

diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml
@@ -86,15 +86,21 @@ jobs:
       - publish
     runs-on: #{{ .Config.runner.default }}#
     steps:
+    - name: Checkout Repo
+      uses: #{{ .Config.actionVersions.checkout }}#
+#{{- if .Config.checkoutSubmodules }}#
+      with:
+        submodules: #{{ .Config.checkoutSubmodules }}#
+#{{- end }}#
+    - name: Setup tools
+      uses: ./.github/actions/setup-tools
+      with:
+        tools: pulumicli, pulumictl, go, node, dotnet, python, java
     - name: Publish SDKs
       uses: #{{ .Config.publish.publisherAction }}#
       with:
         sdk: #{{ .Config.publish.sdk }}#
         version: ${{ needs.prerequisites.outputs.version }}
-        dotnet-version: "#{{ .Config.toolVersions.dotnet }}#"
-        java-version: "#{{ .Config.toolVersions.java }}#"
-        node-version: "#{{ .Config.toolVersions.node }}#"
-        python-version: "#{{ .Config.toolVersions.python }}#"
   publish_go_sdk:
     name: publish_go_sdk
     needs: 

diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/release.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/release.yml
@@ -103,15 +103,21 @@ jobs:
       - publish
     runs-on: #{{ .Config.runner.default }}#
     steps:
+    - name: Checkout Repo
+      uses: #{{ .Config.actionVersions.checkout }}#
+#{{- if .Config.checkoutSubmodules }}#
+      with:
+        submodules: #{{ .Config.checkoutSubmodules }}#
+#{{- end }}#
+    - name: Setup tools
+      uses: ./.github/actions/setup-tools
+      with:
+        tools: pulumicli, pulumictl, go, node, dotnet, python, java
     - name: Publish SDKs
       uses: #{{ .Config.publish.publisherAction }}#
       with:
         sdk: #{{ .Config.publish.sdk }}#
         version: ${{ needs.prerequisites.outputs.version }}
-        dotnet-version: "#{{ .Config.toolVersions.dotnet }}#"
-        java-version: "#{{ .Config.toolVersions.java }}#"
-        node-version: "#{{ .Config.toolVersions.node }}#"
-        python-version: "#{{ .Config.toolVersions.python }}#"
   publish_go_sdk:
     name: publish_go_sdk
     needs:

diff --git a/provider-ci/test-providers/aws/.github/workflows/master.yml b/provider-ci/test-providers/aws/.github/workflows/master.yml
@@ -135,15 +135,19 @@ jobs:
       - publish
     runs-on: ubuntu-latest
     steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: Setup tools
+      uses: ./.github/actions/setup-tools
+      with:
+        tools: pulumicli, pulumictl, go, node, dotnet, python, java
     - name: Publish SDKs
-      uses: pulumi/[email protected].18
+      uses: pulumi/[email protected].19
       with:
         sdk: all
         version: ${{ needs.prerequisites.outputs.version }}
-        dotnet-version: "6.0.x"
-        java-version: "11"
-        node-version: "20.x"
-        python-version: "3.11.8"
 
   tag_release_if_labeled_needs_release:
     name: Tag release if labeled as needs-release

diff --git a/provider-ci/test-providers/aws/.github/workflows/prerelease.yml b/provider-ci/test-providers/aws/.github/workflows/prerelease.yml
@@ -95,15 +95,19 @@ jobs:
       - publish
     runs-on: ubuntu-latest
     steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: Setup tools
+      uses: ./.github/actions/setup-tools
+      with:
+        tools: pulumicli, pulumictl, go, node, dotnet, python, java
     - name: Publish SDKs
-      uses: pulumi/[email protected].18
+      uses: pulumi/[email protected].19
       with:
         sdk: all
         version: ${{ needs.prerequisites.outputs.version }}
-        dotnet-version: "6.0.x"
-        java-version: "11"
-        node-version: "20.x"
-        python-version: "3.11.8"
   publish_go_sdk:
     name: publish_go_sdk
     needs: 

diff --git a/provider-ci/test-providers/aws/.github/workflows/release.yml b/provider-ci/test-providers/aws/.github/workflows/release.yml
@@ -110,15 +110,19 @@ jobs:
       - publish
     runs-on: ubuntu-latest
     steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: Setup tools
+      uses: ./.github/actions/setup-tools
+      with:
+        tools: pulumicli, pulumictl, go, node, dotnet, python, java
     - name: Publish SDKs
-      uses: pulumi/[email protected].18
+      uses: pulumi/[email protected].19
       with:
         sdk: all
         version: ${{ needs.prerequisites.outputs.version }}
-        dotnet-version: "6.0.x"
-        java-version: "11"
-        node-version: "20.x"
-        python-version: "3.11.8"
   publish_go_sdk:
     name: publish_go_sdk
     needs:

diff --git a/provider-ci/test-providers/cloudflare/.github/workflows/master.yml b/provider-ci/test-providers/cloudflare/.github/workflows/master.yml
@@ -131,15 +131,17 @@ jobs:
       - publish
     runs-on: ubuntu-latest
     steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v4
+    - name: Setup tools
+      uses: ./.github/actions/setup-tools
+      with:
+        tools: pulumicli, pulumictl, go, node, dotnet, python, java
     - name: Publish SDKs
-      uses: pulumi/[email protected].18
+      uses: pulumi/[email protected].19
       with:
         sdk: all
         version: ${{ needs.prerequisites.outputs.version }}
-        dotnet-version: "6.0.x"
-        java-version: "11"
-        node-version: "20.x"
-        python-version: "3.11.8"
 
   tag_release_if_labeled_needs_release:
     name: Tag release if labeled as needs-release

diff --git a/provider-ci/test-providers/cloudflare/.github/workflows/prerelease.yml b/provider-ci/test-providers/cloudflare/.github/workflows/prerelease.yml
@@ -93,15 +93,17 @@ jobs:
       - publish
     runs-on: ubuntu-latest
     steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v4
+    - name: Setup tools
+      uses: ./.github/actions/setup-tools
+      with:
+        tools: pulumicli, pulumictl, go, node, dotnet, python, java
     - name: Publish SDKs
-      uses: pulumi/[email protected].18
+      uses: pulumi/[email protected].19
       with:
         sdk: all
         version: ${{ needs.prerequisites.outputs.version }}
-        dotnet-version: "6.0.x"
-        java-version: "11"
-        node-version: "20.x"
-        python-version: "3.11.8"
   publish_go_sdk:
     name: publish_go_sdk
     needs: 

diff --git a/provider-ci/test-providers/cloudflare/.github/workflows/release.yml b/provider-ci/test-providers/cloudflare/.github/workflows/release.yml
@@ -108,15 +108,17 @@ jobs:
       - publish
     runs-on: ubuntu-latest
     steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v4
+    - name: Setup tools
+      uses: ./.github/actions/setup-tools
+      with:
+        tools: pulumicli, pulumictl, go, node, dotnet, python, java
     - name: Publish SDKs
-      uses: pulumi/[email protected].18
+      uses: pulumi/[email protected].19
       with:
         sdk: all
         version: ${{ needs.prerequisites.outputs.version }}
-        dotnet-version: "6.0.x"
-        java-version: "11"
-        node-version: "20.x"
-        python-version: "3.11.8"
   publish_go_sdk:
     name: publish_go_sdk
     needs:

diff --git a/provider-ci/test-providers/docker/.github/workflows/master.yml b/provider-ci/test-providers/docker/.github/workflows/master.yml
@@ -144,15 +144,17 @@ jobs:
       - publish
     runs-on: ubuntu-latest
     steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v4
+    - name: Setup tools
+      uses: ./.github/actions/setup-tools
+      with:
+        tools: pulumicli, pulumictl, go, node, dotnet, python, java
     - name: Publish SDKs
-      uses: pulumi/[email protected].18
+      uses: pulumi/[email protected].19
       with:
         sdk: all
         version: ${{ needs.prerequisites.outputs.version }}
-        dotnet-version: "6.0.x"
-        java-version: "11"
-        node-version: "20.x"
-        python-version: "3.11.8"
 
   tag_release_if_labeled_needs_release:
     name: Tag release if labeled as needs-release

diff --git a/provider-ci/test-providers/docker/.github/workflows/prerelease.yml b/provider-ci/test-providers/docker/.github/workflows/prerelease.yml
@@ -106,15 +106,17 @@ jobs:
       - publish
     runs-on: ubuntu-latest
     steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v4
+    - name: Setup tools
+      uses: ./.github/actions/setup-tools
+      with:
+        tools: pulumicli, pulumictl, go, node, dotnet, python, java
     - name: Publish SDKs
-      uses: pulumi/[email protected].18
+      uses: pulumi/[email protected].19
       with:
         sdk: all
         version: ${{ needs.prerequisites.outputs.version }}
-        dotnet-version: "6.0.x"
-        java-version: "11"
-        node-version: "20.x"
-        python-version: "3.11.8"
   publish_go_sdk:
     name: publish_go_sdk
     needs: 

diff --git a/provider-ci/test-providers/docker/.github/workflows/release.yml b/provider-ci/test-providers/docker/.github/workflows/release.yml
@@ -121,15 +121,17 @@ jobs:
       - publish
     runs-on: ubuntu-latest
     steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v4
+    - name: Setup tools
+      uses: ./.github/actions/setup-tools
+      with:
+        tools: pulumicli, pulumictl, go, node, dotnet, python, java
     - name: Publish SDKs
-      uses: pulumi/[email protected].18
+      uses: pulumi/[email protected].19
       with:
         sdk: all
         version: ${{ needs.prerequisites.outputs.version }}
-        dotnet-version: "6.0.x"
-        java-version: "11"
-        node-version: "20.x"
-        python-version: "3.11.8"
   publish_go_sdk:
     name: publish_go_sdk
     needs: