Skip to content

Commit c50e071

Browse files
authored
Merge pull request #4 from SillyLittleTech/codex/fix-windows-ci-workflow-error
Fix Windows workflow installer artifact detection
2 parents 59f2d6c + e0a769f commit c50e071

2 files changed

Lines changed: 22 additions & 8 deletions

File tree

.github/workflows/build-and-release.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,19 @@ jobs:
7979
shell: bash
8080
run: |
8181
shopt -s nullglob
82-
src=(cross-platform/src-tauri/target/release/bundle/nsis/*.exe)
82+
src=(
83+
cross-platform/src-tauri/target/release/bundle/nsis/*.exe
84+
cross-platform/src-tauri/target/release/bundle/msi/*.msi
85+
)
8386
if [ ${#src[@]} -eq 0 ]; then
84-
echo "No NSIS installer found"
87+
echo "No Windows installer found (expected NSIS .exe or MSI .msi)"
8588
exit 1
8689
fi
87-
cp "${src[0]}" "PinStick-${APP_VERSION}-windows.exe"
90+
installer_path="${src[0]}"
91+
installer_ext="${installer_path##*.}"
92+
installer_name="PinStick-${APP_VERSION}-windows.${installer_ext}"
93+
cp "$installer_path" "$installer_name"
94+
printf "WINDOWS_INSTALLER=%s\n" "$installer_name" >> "$GITHUB_ENV"
8895
8996
- name: Collect Linux AppImage
9097
if: matrix.os == 'ubuntu-22.04'
@@ -110,7 +117,7 @@ jobs:
110117
uses: actions/upload-artifact@v4
111118
with:
112119
name: PinStick-windows
113-
path: PinStick-${{ env.APP_VERSION }}-windows.exe
120+
path: ${{ env.WINDOWS_INSTALLER }}
114121
if-no-files-found: error
115122

116123
- name: Upload Linux artifact

.github/workflows/prerelease.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,19 @@ jobs:
8686
shell: bash
8787
run: |
8888
shopt -s nullglob
89-
src=(cross-platform/src-tauri/target/release/bundle/nsis/*.exe)
89+
src=(
90+
cross-platform/src-tauri/target/release/bundle/nsis/*.exe
91+
cross-platform/src-tauri/target/release/bundle/msi/*.msi
92+
)
9093
if [ ${#src[@]} -eq 0 ]; then
91-
echo "No NSIS installer found"
94+
echo "No Windows installer found (expected NSIS .exe or MSI .msi)"
9295
exit 1
9396
fi
94-
cp "${src[0]}" "PinStick-${APP_VERSION}-windows.exe"
97+
installer_path="${src[0]}"
98+
installer_ext="${installer_path##*.}"
99+
installer_name="PinStick-${APP_VERSION}-windows.${installer_ext}"
100+
cp "$installer_path" "$installer_name"
101+
printf "WINDOWS_INSTALLER=%s\n" "$installer_name" >> "$GITHUB_ENV"
95102
96103
- name: Collect Linux AppImage
97104
if: matrix.os == 'ubuntu-22.04'
@@ -117,7 +124,7 @@ jobs:
117124
uses: actions/upload-artifact@v4
118125
with:
119126
name: PinStick-windows
120-
path: PinStick-${{ env.APP_VERSION }}-windows.exe
127+
path: ${{ env.WINDOWS_INSTALLER }}
121128
if-no-files-found: error
122129

123130
- name: Upload Linux artifact

0 commit comments

Comments
 (0)