Skip to content

Commit 83fe55c

Browse files
jf2048bilelmoussaoui
authored andcommitted
update windows CI to glib 2.74
Also update the windows VM so we can get the latest version of python and gvsbuild, and update gvsbuild command as it now works like a real python package.
1 parent b2c44ac commit 83fe55c

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

.github/workflows/windows.yml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010

1111
gvsbuild:
1212
name: build GTK binaries with gvsbuild
13-
runs-on: windows-2019
13+
runs-on: windows-2022
1414

1515
env:
1616
# git revision of gvsbuild we use for to build GLib and the other dependencies
17-
gvsbuildref: 0121d5bee2e62f1fd6e89a9edab32f9f5765e04a
17+
gvsbuildref: 078140d0b7dcfd6147b3063114fb38365b7ad5a1
1818

1919
# bump this number if you want to force a rebuild of gvsbuild with the same revision
2020
gvsbuildupdate: 1
@@ -45,17 +45,25 @@ jobs:
4545
# Temporarily move the preinstalled git, it causes errors related to cygwin.
4646
- name: (GTK binaries) move git binary
4747
if: steps.cache.outputs.cache-hit != 'true'
48-
run: move "C:\Program Files\Git\usr\bin" "C:\Program Files\Git\usr\notbin"
48+
run: |
49+
move "C:\Program Files\Git\usr\bin" "C:\Program Files\Git\usr\notbin"
50+
move "C:\Program Files\Git\bin" "C:\Program Files\Git\notbin"
4951
shell: cmd
5052

51-
- name: (GTK binaries) run gvsbuild
53+
- name: (GTK binaries) install gvsbuild
5254
if: steps.cache.outputs.cache-hit != 'true'
5355
working-directory: gvsbuild
54-
run: python .\build.py build -p=x64 --vs-ver=16 --msys-dir=C:\msys64 glib cairo pango gdk-pixbuf graphene
56+
run: python -m pip install .
57+
58+
- name: (GTK binaries) run gvsbuild
59+
if: steps.cache.outputs.cache-hit != 'true'
60+
run: gvsbuild build --platform=x64 --vs-ver=17 --msys-dir=C:\msys64 gtk3 graphene
5561

5662
- name: (GTK binaries) restore git binary
5763
if: steps.cache.outputs.cache-hit != 'true'
58-
run: move "C:\Program Files\Git\usr\notbin" "C:\Program Files\Git\usr\bin"
64+
run: |
65+
move "C:\Program Files\Git\usr\notbin" "C:\Program Files\Git\usr\bin"
66+
move "C:\Program Files\Git\notbin" "C:\Program Files\Git\bin"
5967
shell: cmd
6068

6169
- name: (GTK binaries) output cache key
@@ -64,16 +72,16 @@ jobs:
6472

6573
build:
6674
name: build gtk-rs on Windows
67-
runs-on: windows-2019
75+
runs-on: windows-2022
6876
needs: gvsbuild
6977

7078
strategy:
7179
matrix:
7280
conf:
7381
- { name: "cairo", test: true, args: "--features png,pdf,svg,ps,use_glib,v1_16,freetype,script,win32-surface" }
7482
- { name: "gdk-pixbuf", test: true, args: "--features v2_42" }
75-
- { name: "gio", test: true, args: "--features v2_72" }
76-
- { name: "glib", test: true, args: "--features v2_72" }
83+
- { name: "gio", test: true, args: "--features v2_74" }
84+
- { name: "glib", test: true, args: "--features v2_74" }
7785
- { name: "glib-build-tools", test: false, args: "" }
7886
- { name: "graphene", test: false, args: "" }
7987
- { name: "pango", test: true, args: "--features v1_50" }

0 commit comments

Comments
 (0)