Skip to content

Commit c0a0b30

Browse files
authored
Merge pull request #374 from autonomys/simplify-gvsbuild-installation
Simplify `gvsbuild` installation
2 parents 6c23cdf + d02d431 commit c0a0b30

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,7 @@ jobs:
6262

6363
- name: Install GTK4 (Windows)
6464
run: |
65-
# TODO: Next 3 lines should have been `pipx install gvsbuild`, but https://github.com/wingtk/gvsbuild/issues/1436
66-
py -m venv .venv
67-
.\.venv\Scripts\activate.ps1
68-
py -m pip install gvsbuild
65+
pipx install gvsbuild
6966
gvsbuild build gtk4 librsvg
7067
if: runner.os == 'Windows' && steps.cache.outputs.cache-hit != 'true'
7168

.github/workflows/rust.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,7 @@ jobs:
8181

8282
- name: Install GTK4 (Windows)
8383
run: |
84-
# TODO: Next 3 lines should have been `pipx install gvsbuild`, but https://github.com/wingtk/gvsbuild/issues/1436
85-
py -m venv .venv
86-
.\.venv\Scripts\activate.ps1
87-
py -m pip install gvsbuild
84+
pipx install gvsbuild
8885
gvsbuild build gtk4 librsvg
8986
if: runner.os == 'Windows' && steps.cache.outputs.cache-hit != 'true'
9087

@@ -202,10 +199,7 @@ jobs:
202199

203200
- name: Install GTK4 (Windows)
204201
run: |
205-
# TODO: Next 3 lines should have been `pipx install gvsbuild`, but https://github.com/wingtk/gvsbuild/issues/1436
206-
py -m venv .venv
207-
.\.venv\Scripts\activate.ps1
208-
py -m pip install gvsbuild
202+
pipx install gvsbuild
209203
gvsbuild build gtk4 librsvg
210204
if: runner.os == 'Windows' && steps.cache.outputs.cache-hit != 'true'
211205

0 commit comments

Comments
 (0)