Skip to content

Commit 125bd6e

Browse files
committed
Refactor Windows CI workflow and update ssh-studio dependencies
1 parent 54510b2 commit 125bd6e

File tree

2 files changed

+24
-25
lines changed

2 files changed

+24
-25
lines changed

.github/workflows/windows.yml

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,38 @@ on:
77
- "[0-9]+.[0-9]+.[0-9]+"
88

99
jobs:
10-
build-windows-installer:
10+
build-windows:
1111
runs-on: windows-latest
12-
env:
13-
APP_ID: io.github.BuddySirJava.SSH-Studio
14-
APP_NAME: SSH Studio
1512
steps:
16-
- name: Checkout
17-
uses: actions/checkout@v4
13+
- uses: actions/checkout@v3
1814

19-
- name: Setup MSYS2 (UCRT64)
15+
- name: Set up MSYS2
2016
uses: msys2/setup-msys2@v2
2117
with:
2218
msystem: UCRT64
2319
update: true
24-
install: >-
25-
base-devel
26-
git
27-
mingw-w64-ucrt-x86_64-toolchain
28-
mingw-w64-ucrt-x86_64-meson
29-
mingw-w64-ucrt-x86_64-ninja
30-
mingw-w64-ucrt-x86_64-pkg-config
31-
mingw-w64-ucrt-x86_64-python
32-
mingw-w64-ucrt-x86_64-python-pip
33-
mingw-w64-ucrt-x86_64-python-gobject
34-
mingw-w64-ucrt-x86_64-gtk4
35-
mingw-w64-ucrt-x86_64-libadwaita
36-
mingw-w64-ucrt-x86_64-glib2
37-
mingw-w64-ucrt-x86_64-gobject-introspection
38-
mingw-w64-ucrt-x86_64-gsettings-desktop-schemas
20+
21+
- name: Install dependencies
22+
shell: msys2 {0}
23+
run: |
24+
pacman --noconfirm -S --needed \
25+
mingw-w64-ucrt-x86_64-toolchain \
26+
mingw-w64-ucrt-x86_64-meson \
27+
mingw-w64-ucrt-x86_64-ninja \
28+
mingw-w64-ucrt-x86_64-pkg-config \
29+
mingw-w64-ucrt-x86_64-python \
30+
mingw-w64-ucrt-x86_64-python-pip \
31+
mingw-w64-ucrt-x86_64-python-gobject \
32+
mingw-w64-ucrt-x86_64-gtk4 \
33+
mingw-w64-ucrt-x86_64-libadwaita \
34+
mingw-w64-ucrt-x86_64-glib2 \
35+
mingw-w64-ucrt-x86_64-gobject-introspection \
36+
mingw-w64-ucrt-x86_64-gsettings-desktop-schemas \
3937
mingw-w64-ucrt-x86_64-gtk-update-icon-cache
40-
p7zip
41-
nsis
4238
39+
pacman --noconfirm -S --needed \
40+
msys/p7zip \
41+
msys/nsis
4342
- name: Show tool versions
4443
shell: msys2 {0}
4544
run: |

Formula/ssh-studio.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ class SshStudio < Formula
1212

1313
depends_on "glib"
1414
depends_on "gtk4"
15-
depends_on "libadwaita"
1615
depends_on "adwaita-icon-theme"
16+
depends_on "libadwaita"
1717
depends_on "pygobject3"
1818
depends_on "[email protected]"
1919

0 commit comments

Comments
 (0)