Skip to content

Commit c6f6b20

Browse files
chore: update windows CI to 2025 version (#1443)
1 parent 6a850d9 commit c6f6b20

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

.github/workflows/release-windows.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,24 @@ name: Release Windows
99

1010
jobs:
1111
build:
12-
runs-on: windows-2022
12+
runs-on: windows-2025
1313
permissions:
1414
# needed for uploading release artifact
1515
contents: write
1616
defaults:
1717
run:
1818
shell: msys2 {0}
1919
steps:
20+
- name: Install Inno 6
21+
id: install_inno
22+
shell: pwsh
23+
run: |
24+
winget install -e --id JRSoftware.InnoSetup -v 6.4.3 --accept-package-agreements --accept-source-agreements --disable-interactivity --scope machine
25+
if (Test-Path "C:\Program Files (x86)\Inno Setup 6\") {
26+
echo "inno installed successfully"
27+
} else {
28+
throw "could not find inno's installation folder"
29+
}
2030
2131
- name: Set installer name
2232
id: set_installer_name

build-aux/inno_build.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,16 @@ def run_command(command, error_message):
7070
f"Collecting angle dependency ({angle_dll}) DLLs failed",
7171
)
7272

73+
# add libcrypto-3-x64.dll and libssl-3-x64.dll
74+
run_command(
75+
f"cp {build_environment_path}/bin/libcrypto-3-x64.dll {dlls_dir}",
76+
"Collecting libcrypto-3-x64.dll failed",
77+
)
78+
run_command(
79+
f"cp {build_environment_path}/bin/libssl-3-x64.dll {dlls_dir}",
80+
"Collecting libssl-3-x64.dll failed",
81+
)
82+
7383
# Collect necessary GSchema Xml's and compile them into a `gschemas.compiled`
7484
print("Collecting and compiling GSchemas...", file=sys.stderr)
7585
gschemas_dir = os.path.join(build_root, "gschemas")

justfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ setup-win-installer installer_name="rnote-win-installer":
116116
meson setup \
117117
--prefix={{ mingw64_prefix_path }} \
118118
-Dprofile=default \
119-
-Dcli=false \
119+
-Dcli=true \
120120
-Dwin-installer-name={{ installer_name }} \
121121
-Dci={{ ci }} \
122122
{{ build_folder }}

0 commit comments

Comments
 (0)