Skip to content

Commit b1170ca

Browse files
committed
Fix Chocolatey workflow triggers - add multiple trigger types and better version handling
1 parent 91f1869 commit b1170ca

File tree

1 file changed

+28
-8
lines changed

1 file changed

+28
-8
lines changed

.github/workflows/chocolatey.yml

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,46 @@ name: Update Chocolatey Package
22

33
on:
44
workflow_dispatch:
5+
inputs:
6+
version:
7+
description: 'Version to release (e.g., v2.0.1)'
8+
required: true
9+
type: string
510
release:
6-
types: [published]
11+
types: [published, created]
12+
push:
13+
tags:
14+
- 'v*'
715

816
jobs:
917
update-chocolatey:
1018
runs-on: windows-latest
19+
# Prevent duplicate runs
20+
if: github.event_name == 'workflow_dispatch' || (github.event_name == 'release' && github.event.action == 'published') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
1121
steps:
1222
- name: Checkout
1323
uses: actions/checkout@v4
1424

1525
- name: Calculate SHA256
1626
id: sha256
1727
run: |
18-
$VERSION = $env:GITHUB_REF -replace 'refs/tags/', ''
28+
# Handle different trigger types
29+
if ("${{ github.event_name }}" -eq "workflow_dispatch") {
30+
$VERSION = "${{ github.event.inputs.version }}"
31+
} elseif ("${{ github.event_name }}" -eq "release") {
32+
$VERSION = "${{ github.event.release.tag_name }}"
33+
} else {
34+
$VERSION = $env:GITHUB_REF -replace 'refs/tags/', ''
35+
}
36+
37+
Write-Host "Using version: $VERSION"
1938
$URL = "https://github.com/Phara0h/WaspsWithBazookas/releases/download/$VERSION/waspswithbazookas-windows-x86_64.tar.gz"
2039
2140
# Download and calculate SHA256
2241
Invoke-WebRequest -Uri $URL -OutFile "waspswithbazookas.tar.gz"
2342
$hash = Get-FileHash -Algorithm SHA256 "waspswithbazookas.tar.gz"
2443
echo "sha256=$($hash.Hash.ToLower())" >> $env:GITHUB_OUTPUT
44+
echo "version=$VERSION" >> $env:GITHUB_OUTPUT
2545
2646
- name: Checkout Chocolatey Packages Repository
2747
uses: actions/checkout@v4
@@ -155,30 +175,30 @@ EOF
155175
EOF
156176

157177
# Update version in nuspec
158-
sed -i "s/<version>.*<\/version>/<version>${{ github.event.release.tag_name }}<\/version>/" automatic/waspswithbazookas/waspswithbazookas.nuspec
178+
sed -i "s/<version>.*<\/version>/<version>$VERSION<\/version>/" automatic/waspswithbazookas/waspswithbazookas.nuspec
159179

160180
# Update checksum in chocolateyInstall.ps1
161181
sed -i "s/\$checksum = '.*'/\$checksum = '${{ steps.sha256.outputs.sha256 }}'/" automatic/waspswithbazookas/tools/chocolateyInstall.ps1
162182

163183
# Update URL in chocolateyInstall.ps1
164-
sed -i "s|https://github.com/Phara0h/WaspsWithBazookas/releases/download/.*/waspswithbazookas-windows-x86_64.tar.gz|https://github.com/Phara0h/WaspsWithBazookas/releases/download/${{ github.event.release.tag_name }}/waspswithbazookas-windows-x86_64.tar.gz|" automatic/waspswithbazookas/tools/chocolateyInstall.ps1
184+
sed -i "s|https://github.com/Phara0h/WaspsWithBazookas/releases/download/.*/waspswithbazookas-windows-x86_64.tar.gz|https://github.com/Phara0h/WaspsWithBazookas/releases/download/$VERSION/waspswithbazookas-windows-x86_64.tar.gz|" automatic/waspswithbazookas/tools/chocolateyInstall.ps1
165185

166186
- name: Create Pull Request
167187
uses: peter-evans/create-pull-request@v5
168188
with:
169189
repository: chocolatey-community/chocolatey-packages
170190
token: ${{ secrets.CHOCOLATEY_API_KEY }}
171191
path: chocolatey-packages
172-
commit-message: "Update waspswithbazookas to ${{ github.event.release.tag_name }}"
173-
title: "Update waspswithbazookas to ${{ github.event.release.tag_name }}"
192+
commit-message: "Update waspswithbazookas to ${{ steps.sha256.outputs.version || github.event.release.tag_name || github.ref_name }}"
193+
title: "Update waspswithbazookas to ${{ steps.sha256.outputs.version || github.event.release.tag_name || github.ref_name }}"
174194
body: |
175-
Updates waspswithbazookas to version ${{ github.event.release.tag_name }}
195+
Updates waspswithbazookas to version ${{ steps.sha256.outputs.version || github.event.release.tag_name || github.ref_name }}
176196
177197
- Updated version number
178198
- Updated download URL
179199
- Updated SHA256 checksum
180200
- Added proper Chocolatey package structure
181201
182202
Created by GitHub Actions workflow
183-
branch: update-waspswithbazookas-${{ github.event.release.tag_name }}
203+
branch: update-waspswithbazookas-${{ steps.sha256.outputs.version || github.event.release.tag_name || github.ref_name }}
184204
delete-branch: true

0 commit comments

Comments
 (0)