Skip to content

Commit 258b620

Browse files
committed
fix order and msi
1 parent d6b7bbf commit 258b620

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

.github/workflows/myrelease.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,17 @@ jobs:
2222
- run: git fetch --force --tags
2323
- name: install go-msi
2424
run: choco install go-msi
25+
- name: get the version
26+
id: curver
27+
run: |
28+
$v = $(git for-each-ref --sort=-creatordate --count 1 --format="%(refname:short)" "refs/tags/v*")
29+
echo "ver=$(echo $v)" >> $env:GITHUB_OUTPUT
30+
- name: bump semver
31+
uses: actions-ecosystem/action-bump-semver@v1
32+
id: bumpver
33+
with:
34+
current_version: ${{ steps.curver.outputs.ver }}
35+
level: major
2536
- name: build-win-amd64
2637
run: go build -v -o bin/win64/${{env.BIN}}.exe
2738
- name: build-win32
@@ -58,8 +69,8 @@ jobs:
5869
$env:Path += ";C:\Program Files\go-msi;C:\Program Files (x86)\WiX Toolset v3.11\bin"
5970
$env:TMP = "${{ runner.temp }}"
6071
$env:Tempdir = "${{ runner.temp }}"
61-
go-msi.exe make -p wix64.json -a amd64 --msi ${{env.BIN}}-setup-amd64.msi --version 1.0.2
62-
go-msi.exe make -p wix86.json -a 386 --msi ${{env.BIN}}-setup-x86.msi --version 1.0.2
72+
go-msi.exe make -p wix64.json -a amd64 --msi ${{env.BIN}}-${{ steps.bumpver.outputs.new_version }}-setup-amd64.msi --version 1.0.2
73+
go-msi.exe make -p wix86.json -a 386 --msi ${{env.BIN}}-${{ steps.bumpver.outputs.new_version }}-setup-x86.msi --version 1.0.2
6374
- name: pack things to zip
6475
run: |
6576
7z a ${{env.BIN}}-${{ steps.bumpver.outputs.new_version }}-windows-amd64.zip "./bin/win64/${{env.BIN}}.exe" ${{env.EXTRAFILES}}
@@ -69,17 +80,6 @@ jobs:
6980
7z a ${{env.BIN}}-${{ steps.bumpver.outputs.new_version }}-linux-x86.zip ./bin/linux-x86/${{env.BIN}} ${{env.EXTRAFILES}}
7081
7z a ${{env.BIN}}-${{ steps.bumpver.outputs.new_version }}-darwin-amd64.zip ./bin/darwin-amd64/${{env.BIN}} ${{env.EXTRAFILES}}
7182
7z a ${{env.BIN}}-${{ steps.bumpver.outputs.new_version }}-darwin-arm64.zip ./bin/darwin-arm64/${{env.BIN}} ${{env.EXTRAFILES}}
72-
- name: get the version
73-
id: curver
74-
run: |
75-
$v = $(git for-each-ref --sort=-creatordate --count 1 --format="%(refname:short)" "refs/tags/v*")
76-
echo "ver=$(echo $v)" >> $env:GITHUB_OUTPUT
77-
- name: bump semver
78-
uses: actions-ecosystem/action-bump-semver@v1
79-
id: bumpver
80-
with:
81-
current_version: ${{ steps.curver.outputs.ver }}
82-
level: major
8383
- name: push the tag
8484
env:
8585
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)