Skip to content

Commit ed87ea3

Browse files
authored
Update ci-win.yml (#2265)
* Update ci-win.yml * Update ci-win.yml * Update ci-win.yml * fix win * release
1 parent 749c400 commit ed87ea3

File tree

7 files changed

+156
-0
lines changed

7 files changed

+156
-0
lines changed

.github/workflows/ci-linux.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,3 +147,12 @@ jobs:
147147
files: ${{runner.workspace}}/build/vnote-linux-x64.AppImage
148148
release: Continuous Build
149149
tag: continuous-build
150+
151+
- name: Release
152+
if: github.ref == 'refs/heads/master' && startsWith(github.event.head_commit.message, '[Release]')
153+
uses: johnwbyrd/[email protected]
154+
with:
155+
token: ${{ secrets.GITHUB_TOKEN }}
156+
files: ${{runner.workspace}}/build/vnote-linux-x64.AppImage
157+
release: Release v${{env.VNOTE_VER}}
158+
tag: v${{env.VNOTE_VER}}

.github/workflows/ci-macos.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,3 +160,12 @@ jobs:
160160
files: ${{runner.workspace}}/build/vnote-mac-x64-qt${{matrix.config.qt}}.dmg
161161
release: Continuous Build
162162
tag: continuous-build
163+
164+
- name: Release
165+
if: github.ref == 'refs/heads/master' && startsWith(github.event.head_commit.message, '[Release]')
166+
uses: johnwbyrd/[email protected]
167+
with:
168+
token: ${{ secrets.GITHUB_TOKEN }}
169+
files: ${{runner.workspace}}/build/vnote-mac-x64-qt${{matrix.config.qt}}.dmg
170+
release: Release v${{env.VNOTE_VER}}
171+
tag: v${{env.VNOTE_VER}}

.github/workflows/ci-win.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ jobs:
113113
set openssl_dir=openssl-utils.git\1.1.1j\Win_${{matrix.config.platform}}
114114
copy %openssl_dir%\lib*.dll "%DISTRIB_PATH%\"
115115
copy "%GITHUB_WORKSPACE%\README.md" "%DISTRIB_PATH%\README.md"
116+
copy "%GITHUB_WORKSPACE%\src\data\core\icons\vnote.ico" "%DISTRIB_PATH%\vnote.ico"
116117
copy "%GITHUB_WORKSPACE%\COPYING.LESSER" "%DISTRIB_PATH%\COPYING.LESSER"
117118
echo %GITHUB_SHA% > "%DISTRIB_PATH%\commit"
118119
del /F /Q "%DISTRIB_PATH%\translations\qt_*.qm"
@@ -121,6 +122,16 @@ jobs:
121122
env:
122123
DISTRIB_PATH: ${{runner.workspace}}/build/distrib/vnote
123124

125+
- name: Package Installer
126+
shell: cmd
127+
run: |
128+
git clone https://github.com/vnotex/mkmsi.git mkmsi.git --depth=1
129+
python .\mkmsi.git\mkmsi.py --auto-create qt --source-dir "%DISTRIB_PATH%" --wix-root "C:\Program Files (x86)\WiX Toolset v3.11" --merge-module "C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC140_CRT_${{matrix.config.platform}}.msm" --add-desktop-shortcut --project-version ${{env.VNOTE_VER}} --license %GITHUB_WORKSPACE%\package\lgpl-3.0.rtf --executable vnote.exe --wix-banner %GITHUB_WORKSPACE%\package\wix_banner.png --wix-dialog %GITHUB_WORKSPACE%\package\wix_dialog.png VNote
130+
move VNote.msi .\distrib\VNote-win-${{matrix.config.platform}}-qt${{matrix.config.qt}}_v${{env.VNOTE_VER}}.msi
131+
working-directory: ${{runner.workspace}}/build
132+
env:
133+
DISTRIB_PATH: ${{runner.workspace}}/build/distrib/vnote
134+
124135
- name: Archive Artifacts
125136
uses: actions/upload-artifact@v2
126137
with:
@@ -129,6 +140,14 @@ jobs:
129140
env:
130141
DISTRIB_PATH: ${{runner.workspace}}/build/distrib/vnote
131142

143+
- name: Archive Installer
144+
uses: actions/upload-artifact@v2
145+
with:
146+
name: VNote-win-${{matrix.config.platform}}-qt${{matrix.config.qt}}_v${{env.VNOTE_VER}}.msi
147+
path: ${{runner.workspace}}/build/distrib/VNote*.msi
148+
env:
149+
DISTRIB_PATH: ${{runner.workspace}}/build/distrib/vnote
150+
132151
- name: Update Tag
133152
if: github.ref == 'refs/heads/master'
134153
shell: bash
@@ -144,3 +163,12 @@ jobs:
144163
files: ${{runner.workspace}}/build/vnote-win-${{matrix.config.platform}}-qt${{matrix.config.qt}}.zip
145164
release: Continuous Build
146165
tag: continuous-build
166+
167+
- name: Rlease
168+
if: github.ref == 'refs/heads/master' && startsWith(github.event.head_commit.message, '[Release]')
169+
uses: johnwbyrd/[email protected]
170+
with:
171+
token: ${{ secrets.GITHUB_TOKEN }}
172+
files: ${{runner.workspace}}/build/vnote-win-${{matrix.config.platform}}-qt${{matrix.config.qt}}.zip ${{runner.workspace}}/build/distrib/VNote*.msi
173+
release: Release v${{env.VNOTE_VER}}
174+
tag: v${{env.VNOTE_VER}}

package/banner_text.png

4.13 KB
Loading

0 commit comments

Comments
 (0)