Skip to content

Commit 62b5599

Browse files
committed
Install aqtinstall using uv in Windows CI
This means there's no need for pip caching.
1 parent be496e0 commit 62b5599

File tree

2 files changed

+10
-20
lines changed

2 files changed

+10
-20
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,10 @@ jobs:
249249
with:
250250
python-version: '3.10'
251251

252-
- name: pip cache
253-
uses: actions/cache@v4
252+
- name: Install uv
253+
uses: astral-sh/setup-uv@eb1897b8dc4b5d5bfe39a428a8f2304605e0983c # v7.0.0
254254
with:
255-
path: ~\AppData\Local\pip\Cache
256-
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
255+
version: ${{ env.UV_VERSION }}
257256

258257
- name: Get Boost metadata
259258
id: boost-metadata
@@ -334,9 +333,7 @@ jobs:
334333
- name: Download Qt
335334
id: qt-metadata
336335
run: |
337-
python -m pip install aqtinstall==${{ env.AQTINSTALL_VERSION }}
338-
339-
aqt install-qt windows desktop ${env:QT_VERSION} win64_msvc2022_64
336+
uv run --with aqtinstall==${{ env.AQTINSTALL_VERSION }} -- aqt install-qt windows desktop ${env:QT_VERSION} win64_msvc2022_64
340337
echo "root=${{ github.workspace }}/${env:QT_VERSION}/msvc2022_64" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
341338
342339
- name: Checkout libloot repository
@@ -374,11 +371,6 @@ jobs:
374371
- name: Run tests
375372
run: ctest --test-dir build --output-on-failure --parallel --build-config Release
376373

377-
- name: Install uv
378-
uses: astral-sh/setup-uv@eb1897b8dc4b5d5bfe39a428a8f2304605e0983c # v7.0.0
379-
with:
380-
version: ${{ env.UV_VERSION }}
381-
382374
- name: Install packages for building docs
383375
run: uv sync --locked --project docs
384376

.github/workflows/release.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ jobs:
4343
with:
4444
python-version: '3.10'
4545

46+
- name: Install uv
47+
uses: astral-sh/setup-uv@eb1897b8dc4b5d5bfe39a428a8f2304605e0983c # v7.0.0
48+
with:
49+
version: "0.8.20"
50+
4651
- name: Get Boost metadata
4752
id: boost-metadata
4853
run: |
@@ -109,9 +114,7 @@ jobs:
109114
- name: Download Qt
110115
id: qt-metadata
111116
run: |
112-
python -m pip install aqtinstall==3.3.0
113-
114-
aqt install-qt windows desktop ${env:QT_VERSION} win64_msvc2022_64
117+
uv run --with aqtinstall==3.3.0 -- aqt install-qt windows desktop ${env:QT_VERSION} win64_msvc2022_64
115118
echo "root=${{ github.workspace }}/${env:QT_VERSION}/msvc2022_64" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
116119
117120
- name: Run CMake
@@ -124,11 +127,6 @@ jobs:
124127
-B build
125128
cmake --build build --config Release
126129
127-
- name: Install uv
128-
uses: astral-sh/setup-uv@eb1897b8dc4b5d5bfe39a428a8f2304605e0983c # v7.0.0
129-
with:
130-
version: "0.8.20"
131-
132130
- name: Install packages for building docs
133131
run: uv sync --locked --project docs
134132

0 commit comments

Comments
 (0)