Skip to content

Commit d38bc6e

Browse files
author
tanin
committed
CI for publishing windows
1 parent 0049f66 commit d38bc6e

File tree

5 files changed

+34
-19
lines changed

5 files changed

+34
-19
lines changed

.github/workflows/create-release-mac.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ jobs:
2222
steps:
2323
- name: Checkout
2424
uses: actions/checkout@v4
25-
with:
26-
ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || github.ref_name }}
2725
- name: Import Signing Certificate
2826
run: |
2927
# Create a temporary keychain

.github/workflows/create-release-windows.yml

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: create-release-mac
1+
name: create-release-windows
22

33
on:
44
push:
@@ -18,63 +18,82 @@ permissions:
1818
jobs:
1919
build:
2020
runs-on: windows-latest
21+
defaults:
22+
run:
23+
shell: msys2 {0}
2124

2225
steps:
26+
- uses: msys2/setup-msys2@v2
27+
with:
28+
update: true
29+
install: >-
30+
curl
31+
git
32+
gcc
33+
- uses: actions/setup-node@v4
34+
with:
35+
node-version: '22'
36+
- name: Debug node
37+
run: |
38+
node --version
39+
npm --version
2340
- name: Checkout
2441
uses: actions/checkout@v4
25-
with:
26-
ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || github.ref_name }}
42+
- name: Install Node modules
43+
run: npm install
44+
- name: Debug node
45+
run: |
46+
./node_modules/.bin/postcss.cmd --help
47+
./node_modules/.bin/webpack.cmd --help
48+
./node_modules/.bin/postcss.cmd ./frontend/stylesheets/tailwindbase.css --config . --output ./build/compiled-frontend-resources/assets/stylesheets/tailwindbase.css
2749
- uses: actions/setup-java@v4
2850
with:
2951
distribution: temurin
3052
java-version: '21'
3153
cache: 'gradle'
32-
- uses: actions/setup-node@v4
33-
with:
34-
node-version: '22'
3554
- name: Setup Gradle
3655
uses: gradle/actions/setup-gradle@v3
3756
with:
3857
cache-read-only: ${{ github.ref != 'refs/heads/main' }}
3958
- name: Get version
4059
id: version
41-
run: echo "VERSION=$(./gradlew -q printInternalVersion)" >> "$GITHUB_OUTPUT"
60+
run: |
61+
version=$(./gradlew -q printInternalVersion)
62+
echo "VERSION=$version" >> $GITHUB_OUTPUT
4263
- name: Validate the tag name
4364
run: |
44-
if [ "${{ github.event_name }}" == "workflow_dispatch" ] && [ ! -z "${{ github.event.inputs.tag }}" ]; then
65+
if [[ "${{ github.event_name }}" == "workflow_dispatch" && ! -z "${{ github.event.inputs.tag }}" ]]; then
4566
TAG=${{ github.event.inputs.tag }}
4667
else
4768
TAG=${GITHUB_REF#refs/tags/}
4869
fi
4970
if [[ ! "$TAG" =~ ^v ]]; then
5071
echo "Error: Tag ($TAG) must start with 'v'"
5172
exit 1
52-
fi
73+
fi
5374
if [[ ! $TAG == v${{ steps.version.outputs.VERSION }} ]]; then
5475
echo "Error: Git tag version ($TAG) doesn't match project version (v${{ steps.version.outputs.VERSION }})"
5576
exit 1
5677
fi
57-
- name: Install Node modules
58-
run: npm install
5978
- name: Download CodeSignTool and extract
6079
run: |
6180
$ProgressPreference = 'SilentlyContinue'
6281
New-Item -ItemType Directory -Force -Path "./build-tools/codesign"
6382
Invoke-WebRequest -Uri "https://www.ssl.com/download/codesigntool-for-windows/" -OutFile "./build-tools/CodeSignTool.zip"
6483
Expand-Archive -Path "./build-tools/CodeSignTool.zip" -DestinationPath "./build-tools/codesign" -Force
6584
Remove-Item "./build-tools/CodeSignTool.zip"
66-
shell: pwsh
85+
shell: powershell
6786
- name: Download wixtool 3 and extract
6887
run: |
6988
$ProgressPreference = 'SilentlyContinue'
7089
New-Item -ItemType Directory -Force -Path "./build-tools/wixtool"
7190
Invoke-WebRequest -Uri "https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314-binaries.zip" -OutFile "./build-tools/wix-binaries.zip"
7291
Expand-Archive -Path "./build-tools/wix-binaries.zip" -DestinationPath "./build-tools/wixtool" -Force
7392
Remove-Item "./build-tools/wix-binaries.zip"
74-
shell: pwsh
93+
shell: powershell
7594
- name: Build an MSI
7695
run: |
77-
export PATH="$PATH:$PWD/build-tools/wixtool"
96+
export PATH="${PATH}:$PWD/build-tools/wixtool"
7897
./gradlew clean jpackage
7998
env:
8099
CODESIGN_TOOL_DIR: "./build-tools/codesign"

.github/workflows/publish-mac-testflight.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ jobs:
1919
steps:
2020
- name: Checkout
2121
uses: actions/checkout@v4
22-
with:
23-
ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || github.ref_name }}
2422
- name: Import Signing Certificate
2523
run: |
2624
# Create a temporary keychain

src/main/c/WindowsApi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ __declspec(dllexport) char* openFileDialog(long hwnd, bool isSaved) {
1717

1818
ZeroMemory(&ofn, sizeof(ofn));
1919
ofn.lStructSize = sizeof(ofn);
20-
ofn.hwndOwner = (HWND) (uintptr_t) hwnd;
20+
ofn.hwndOwner = (HWND) (size_t) hwnd;
2121
ofn.lpstrFile = szFile;
2222
ofn.lpstrFile[0] = '\0';
2323
ofn.nMaxFile = sizeof(szFile);
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)