From cefb0072109012c45d112f8ebd2ca4d80ce66d86 Mon Sep 17 00:00:00 2001
From: Jan-Willem de Bruyn <jan.willem.de.bruyn@avivasolutions.nl>
Date: Mon, 24 Jul 2023 10:29:57 +0200
Subject: [PATCH] Update release / prerelease yaml files to match
 pull-request.yml

---
 .github/workflows/prerelease.yml |  9 +++++++
 .github/workflows/release.yml    | 41 ++++++++++++++++----------------
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index 019b659..8bfa228 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -159,6 +159,10 @@ jobs:
       uses: actions/checkout@v3
       with:
         submodules: recursive
+    - name: Install pulumictl
+      uses: jaxxstorm/action-install-gh-release@v1.1.0
+      with:
+        repo: pulumi/pulumictl
     - name: Setup Go
       uses: actions/setup-go@v4
       with:
@@ -223,6 +227,11 @@ jobs:
         path: ${{ github.workspace}}/sdk
     - name: Unzip DotNet SDK
       run: tar -zxf ${{ github.workspace}}/sdk/dotnet.tar.gz -C ${{ github.workspace}}/sdk/dotnet
+    - name: Checkout Scripts Repo
+      uses: actions/checkout@v3
+      with:
+        path: ci-scripts
+        repository: pulumi/scripts
     - env:
         NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
       name: Publish SDKs
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c9afd13..930c5d0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,11 +18,10 @@ jobs:
       uses: actions/checkout@v3
       with:
         submodules: recursive
-    - name: Checkout Scripts Repo
+    - name: Unshallow clone for tags
       uses: actions/checkout@v3
       with:
-        path: ci-scripts
-        repository: pulumi/scripts
+        fetch-depth: 0
     - name: Install Go
       uses: actions/setup-go@v4
       with:
@@ -59,6 +58,11 @@ jobs:
         -exec chmod +x {} \;
     - name: Build SDK
       run: make build_${{ matrix.language }}
+    - name: Checkout Scripts Repo
+      uses: actions/checkout@v3
+      with:
+        path: ci-scripts
+        repository: pulumi/scripts
     - name: Check worktree clean
       run: ${{ github.workspace }}/ci-scripts/ci/check-worktree-is-clean
     - name: Compress SDK folder
@@ -93,11 +97,10 @@ jobs:
       uses: actions/checkout@v3
       with:
         submodules: recursive
-    - name: Checkout Scripts Repo
+    - name: Unshallow clone for tags
       uses: actions/checkout@v3
       with:
-        path: ci-scripts
-        repository: pulumi/scripts
+        fetch-depth: 0
     - name: Install Go
       uses: actions/setup-go@v4
       with:
@@ -128,11 +131,8 @@ jobs:
     steps:
     - name: Checkout Repo
       uses: actions/checkout@v3
-    - name: Checkout Scripts Repo
-      uses: actions/checkout@v3
       with:
-        path: ci-scripts
-        repository: pulumi/scripts
+        submodules: recursive
     - name: Unshallow clone for tags
       uses: actions/checkout@v3
       with:
@@ -159,11 +159,6 @@ jobs:
       uses: actions/checkout@v3
       with:
         submodules: recursive
-    - name: Checkout Scripts Repo
-      uses: actions/checkout@v3
-      with:
-        path: ci-scripts
-        repository: pulumi/scripts
     - name: Install pulumictl
       uses: jaxxstorm/action-install-gh-release@v1.1.0
       with:
@@ -186,11 +181,10 @@ jobs:
       uses: actions/checkout@v3
       with:
         submodules: recursive
-    - name: Checkout Scripts Repo
+    - name: Unshallow clone for tags
       uses: actions/checkout@v3
       with:
-        path: ci-scripts
-        repository: pulumi/scripts
+        fetch-depth: 0
     - name: Install Go
       uses: actions/setup-go@v4
       with:
@@ -202,14 +196,14 @@ jobs:
     - name: Install Pulumi CLI
       uses: pulumi/actions@v4
     - name: Setup Node
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         always-auth: true
         registry-url: https://registry.npmjs.org
     - name: Setup DotNet
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
     - name: Setup Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
     - name: Download Python SDK
       uses: actions/download-artifact@v3
       with:
@@ -233,6 +227,11 @@ jobs:
         path: ${{ github.workspace}}/sdk
     - name: Unzip DotNet SDK
       run: tar -zxf ${{ github.workspace}}/sdk/dotnet.tar.gz -C ${{ github.workspace}}/sdk/dotnet
+    - name: Checkout Scripts Repo
+      uses: actions/checkout@v3
+      with:
+        path: ci-scripts
+        repository: pulumi/scripts
     - env:
         NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
       name: Publish SDKs