fix: trigger chocolatey workflow after release workflow completes (#306)

Author: pranav-okta

.github/workflows/chocolatey.yml

@@ -1,14 +1,16 @@
 name: Chocolatey Deploy
 
-# This GH action will push a okta-aws-cli build to chocolatey.org when a
-# okta-aws-cli GH release is completed.
-# 
+# This workflow runs after the release workflow completes successfully,
+# ensuring release assets are available before packaging for Chocolatey.
+#
 # inspired by https://github.com/rcmaehl/MSEdgeRedirect thank you rcmaehl 🙏🙏🙏
 
 on:
-  release:
+  workflow_run:
+    workflows: ["release"]
     types:
-      - published
+      - completed
+  workflow_dispatch: # Manual trigger for re-runs if needed
 
 defaults:
   run:
@@ -17,53 +19,62 @@ defaults:
 jobs:
   chocolatey:
     runs-on: windows-latest
+    # Only run if manually triggered OR release workflow succeeded on a tag
+    if: ${{ github.event_name == 'workflow_dispatch' || (github.event.workflow_run.conclusion == 'success' && startsWith(github.event.workflow_run.head_branch, 'v')) }}
     steps:
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v4
-      -
-        name: Unshallow
+
+      - name: Unshallow
         run: git fetch --prune --unshallow
-      -
-        name: Get latest release tag
+
+      - name: Get latest release tag
         uses: oprypin/find-latest-tag@v1
         with:
           repository: ${{ github.repository }}
           releases-only: true
         id: latesttag
-      -
-        name: Set Version
+
+      - name: Set Version
         id: version
         run: |
           version=$(echo "${{ steps.latesttag.outputs.tag }}" | grep -oE "[[:digit:]]{1,}\.[[:digit:]]{1,}\.[[:digit:]]{1,}")
           echo "nuget=$version" >> $GITHUB_OUTPUT
           sed -i "s/{VERSION}/${version}/g" "nuspec/chocolatey/okta-aws-cli.nuspec"
-      -
-        name: Set Checksum
+
+      - name: Download and Embed Binary
         run: |
           filename="okta-aws-cli_${{ steps.version.outputs.nuget }}_windows_386.zip"
           url="https://github.com/${{ github.repository }}/releases/download/${{ steps.latesttag.outputs.tag }}/${filename}"
-          sed -i "s#{ZIPURL}#${url}#g" "nuspec/chocolatey/tools/chocolateyinstall.ps1"
-          curl -sSL "${url}" -o "nuspec/chocolatey/${filename}"
-          sha256=$(cat "nuspec/chocolatey/${filename}" | sha256sum -)
-          sed -i "s/{SHA256CHECKSUM}/${sha256:0:64}/g" "nuspec/chocolatey/tools/chocolateyinstall.ps1"
-      -
-        name: Choco Downgrade
+
+          echo "Downloading ${url}..."
+          curl -sSL --fail "${url}" -o "nuspec/chocolatey/tools/okta-aws-cli.zip"
+
+          # Verify the downloaded file is a valid zip archive
+          if [ "$(head -c 2 "nuspec/chocolatey/tools/okta-aws-cli.zip")" != "PK" ]; then
+            echo "ERROR: Downloaded file is not a valid zip archive"
+            exit 1
+          fi
+
+          echo "Successfully downloaded and verified binary"
+          ls -la nuspec/chocolatey/tools/
+
+      - name: Choco Downgrade
         uses: crazy-max/ghaction-chocolatey@v3
         with:
           args: install chocolatey --version=1.2.1 --allow-downgrade -y -r --no-progress
-      -
-        name: Pack Release
+
+      - name: Pack Release
         uses: crazy-max/ghaction-chocolatey@v3
         with:
           args: pack nuspec/chocolatey/okta-aws-cli.nuspec --outputdirectory nuspec/chocolatey
-      -
-        name: Choco Upgrade
+
+      - name: Choco Upgrade
         uses: crazy-max/ghaction-chocolatey@v3
         with:
           args: upgrade chocolatey
-      -
-        name: Upload Release
+
+      - name: Upload Release
         uses: crazy-max/ghaction-chocolatey@v3
         with:
-          args: push nuspec/chocolatey/okta-aws-cli.${{ steps.version.outputs.nuget }}.nupkg -s https://push.chocolatey.org/ -k ${{ secrets.CHOCO_API_KEY }}
+          args: push nuspec/chocolatey/okta-aws-cli.${{ steps.version.outputs.nuget }}.nupkg -s https://push.chocolatey.org/ -k ${{ secrets.CHOCO_API_KEY }}

.github/workflows/release.yml

@@ -5,35 +5,35 @@ on:
       - master
       - m2m_feature
     tags:
-      - 'v*'
+      - "v*"
 jobs:
   goreleaser:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f #v3.4.0
-      -
-        name: Unshallow
+
+      - name: Unshallow
         run: git fetch --prune --unshallow
-      -
-        name: Set up Go
+
+      - name: Set up Go
         uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 #v3.5.0
         with:
           go-version: 1.21
-      -
-        name: Import GPG key
+
+      - name: Import GPG key
         id: import_gpg
-        uses: crazy-max/ghaction-import-gpg@111c56156bcc6918c056dbef52164cfa583dc549 #v5.2.0
+        uses:
+          crazy-max/ghaction-import-gpg@111c56156bcc6918c056dbef52164cfa583dc549 #v5.2.0
           # These secrets will need to be configured for the repository:
         with:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.PASSPHRASE }}
-      -
-        name: Run GoReleaser
+
+      - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v6.0.0
         with:
-          version: '~> v2'
+          version: "~> v2"
           args: release --clean
         env:
           GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}

nuspec/chocolatey/tools/chocolateyinstall.ps1

@@ -1,30 +1,10 @@
-
 $ErrorActionPreference = 'Stop'
-$toolsDir   = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
-
-$packageArgs = @{
-  packageName   = $env:ChocolateyPackageName
-  unzipLocation = $toolsDir
-  url           = '{ZIPURL}'
-  checksum      = '{SHA256CHECKSUM}'
-  checksumType  = 'sha256'
-}
-
-Install-ChocolateyZipPackage @packageArgs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
 
+# Extract the embedded zip file (no remote download needed)
+$zipPath = Join-Path -Path $toolsDir -ChildPath 'okta-aws-cli.zip'
+Get-ChocolateyUnzip -FileFullPath $zipPath -Destination $toolsDir -PackageName $env:ChocolateyPackageName
 
+# Clean up the zip after extraction
+Remove-Item -Path $zipPath -Force -ErrorAction SilentlyContinue