Skip to content

Commit e80c78d

Browse files
ci/msvc: Build GLib as a first step
1 parent 639fc74 commit e80c78d

File tree

1 file changed

+24
-3
lines changed

1 file changed

+24
-3
lines changed

.github/workflows/windows-msvc.yml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ jobs:
2525
name: Windows MSVC
2626
runs-on: windows-latest
2727
continue-on-error: true
28-
env:
29-
PKG_CONFIG_PATH: 'C:\gnome\lib\pkgconfig'
3028

3129
steps:
3230
- uses: actions/checkout@v6
@@ -53,6 +51,12 @@ jobs:
5351
ls C:\pkg-config-lite-0.28-1\bin
5452
pkg-config --version
5553
54+
- name: Clone GLib
55+
working-directory: /
56+
if: steps.cache.outputs.cache-hit != 'true'
57+
run: |
58+
git clone https://gitlab.gnome.org/GNOME/glib.git --depth 1
59+
5660
- name: Clone GTK
5761
working-directory: /
5862
if: steps.cache.outputs.cache-hit != 'true'
@@ -72,11 +76,28 @@ jobs:
7276
with:
7377
architecture: x64
7478

79+
- name: Set PKG_CONFIG_PATH
80+
shell: bash
81+
run: |
82+
echo "PKG_CONFIG_PATH=C:/gnome/lib/pkgconfig" >> $GITHUB_ENV
83+
84+
- name: Prepare GLib build
85+
working-directory: /glib
86+
if: steps.cache.outputs.cache-hit != 'true'
87+
run: |
88+
meson setup builddir --prefix=C:/gnome -Dtests=false -Dsysprof=disabled
89+
90+
- name: Build and install GLib
91+
working-directory: /glib
92+
if: steps.cache.outputs.cache-hit != 'true'
93+
run: |
94+
meson install -C builddir
95+
7596
- name: Prepare GTK build
7697
working-directory: /gtk
7798
if: steps.cache.outputs.cache-hit != 'true'
7899
run: |
79-
meson setup builddir --prefix=C:/gnome -Dbuild-demos=false -Dbuild-tests=false -Dvulkan=disabled -Dmedia-gstreamer=disabled -Dbuild-examples=false -Dglib:tests=false -Dharfbuzz:tests=disabled -Dharfbuzz:docs=disabled -Dgraphene:tests=false -Dgdk-pixbuf:tests=false -Dcairo:tests=disabled -Dglib:sysprof=disabled -Dgdk-pixbuf:documentation=false
100+
meson setup builddir --prefix=C:/gnome -Dbuild-demos=false -Dbuild-tests=false -Dvulkan=disabled -Dmedia-gstreamer=disabled -Dbuild-examples=false -Dharfbuzz:tests=disabled -Dharfbuzz:docs=disabled -Dgraphene:tests=false -Dgdk-pixbuf:tests=false -Dcairo:tests=disabled -Dgdk-pixbuf:documentation=false
80101
81102
- name: Build and install GTK
82103
working-directory: /gtk

0 commit comments

Comments
 (0)