Skip to content

Commit 9b8e2b3

Browse files
committed
Simplify ARM64 workflow: lt20-only smoke/release and no PDB artifacts
1 parent 2a09c82 commit 9b8e2b3

1 file changed

Lines changed: 21 additions & 51 deletions

File tree

.github/workflows/ci_windows_arm64_native.yaml

Lines changed: 21 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,17 @@ env:
1515
qbt_version: "5.2.3"
1616
qt_version: "6.10.3"
1717
vcpkg_triplet: "arm64-windows-static-release"
18+
libt_variant: "lt20"
19+
libt_ref: "da7a68a440b7abf4eb1a237df7168be0b8b17084"
20+
libt_version_display: "2.0.13+gitda7a68a440"
21+
boost_version: "1.91.0"
22+
archive_suffix: "_lt20"
23+
artifact_name: "arm64-native-lt20"
1824

1925
jobs:
2026
build-windows-arm64-native:
21-
name: Build Native ARM64 (${{ matrix.libt_variant }})
27+
name: Build Native ARM64 (lt20)
2228
runs-on: windows-latest
23-
strategy:
24-
fail-fast: false
25-
matrix:
26-
include:
27-
- libt_variant: lt20
28-
libt_ref: da7a68a440b7abf4eb1a237df7168be0b8b17084
29-
boost_version: "1.91.0"
30-
libt_version_display: "2.0.13+gitda7a68a440"
31-
archive_suffix: "_lt20"
32-
artifact_name: arm64-native-lt20
3329
env:
3430
boost_root: "${{ github.workspace }}/../boost"
3531
libtorrent_root: "${{ github.workspace }}/../libtorrent-msvc-arm64"
@@ -81,7 +77,7 @@ jobs:
8177
- name: Build source URLs
8278
shell: pwsh
8379
run: |
84-
$boostVersion = "${{ matrix.boost_version }}"
80+
$boostVersion = "${{ env.boost_version }}"
8581
$boostVersionUnderscored = $boostVersion -replace '\.', '_'
8682
"BOOST_URL=https://archives.boost.io/release/$boostVersion/source/boost_${boostVersionUnderscored}.7z" >> $env:GITHUB_ENV
8783
"QBT_URL=https://github.com/qbittorrent/qBittorrent/archive/refs/tags/release-${{ env.qbt_version }}.tar.gz" >> $env:GITHUB_ENV
@@ -135,7 +131,7 @@ jobs:
135131
git init libtorrent
136132
Set-Location libtorrent
137133
git remote add origin https://github.com/arvidn/libtorrent.git
138-
git fetch --depth 1 origin ${{ matrix.libt_ref }}
134+
git fetch --depth 1 origin ${{ env.libt_ref }}
139135
git checkout FETCH_HEAD
140136
git submodule update --init --recursive --depth 1
141137
@@ -225,57 +221,37 @@ jobs:
225221
shell: pwsh
226222
run: |
227223
$releaseDir = "release"
228-
$symbolsDir = "symbols"
229224
$artifactDir = "artifact"
230-
$archiveName = "qbittorrent_${{ env.qbt_version }}${{ matrix.archive_suffix }}_arm64.zip"
225+
$archiveName = "qbittorrent_${{ env.qbt_version }}${{ env.archive_suffix }}_arm64.zip"
231226
232227
New-Item -ItemType Directory -Path $releaseDir -Force | Out-Null
233-
New-Item -ItemType Directory -Path $symbolsDir -Force | Out-Null
234228
New-Item -ItemType Directory -Path $artifactDir -Force | Out-Null
235229
236230
Copy-Item "qbittorrent-release-${{ env.qbt_version }}/build/qbittorrent.exe" $releaseDir
237231
Copy-Item "qbittorrent-release-${{ env.qbt_version }}/dist/windows/qt.conf" $releaseDir
238232
239-
$symbols = Get-ChildItem "qbittorrent-release-${{ env.qbt_version }}/build" -Filter "*.pdb" -File -ErrorAction SilentlyContinue
240-
if ($symbols) {
241-
$symbols | Copy-Item -Destination $symbolsDir
242-
}
243-
244233
Set-Location $releaseDir
245234
7z a "../$archiveName" *
246235
Set-Location ..
247236
248237
Move-Item $archiveName $artifactDir
249-
if ((Get-ChildItem $symbolsDir -File -ErrorAction SilentlyContinue).Count -gt 0) {
250-
Move-Item $symbolsDir $artifactDir
251-
}
252238
253239
- name: Upload build artifact
254240
uses: actions/upload-artifact@v4
255241
with:
256-
name: ${{ matrix.artifact_name }}
242+
name: ${{ env.artifact_name }}
257243
path: artifact
258244

259245
smoke-test-windows-arm64-native:
260-
name: Smoke test Native ARM64 (${{ matrix.libt_variant }})
246+
name: Smoke test Native ARM64 (lt20)
261247
needs: build-windows-arm64-native
262248
runs-on: windows-latest
263-
strategy:
264-
fail-fast: false
265-
matrix:
266-
include:
267-
- libt_variant: lt12
268-
artifact_name: arm64-native-lt12
269-
archive_suffix: ""
270-
- libt_variant: lt20
271-
artifact_name: arm64-native-lt20
272-
archive_suffix: "_lt20"
273249

274250
steps:
275251
- name: Download build artifact
276252
uses: actions/download-artifact@v4
277253
with:
278-
name: ${{ matrix.artifact_name }}
254+
name: ${{ env.artifact_name }}
279255
path: artifact
280256

281257
- name: Validate ARM64 qBittorrent artifact
@@ -286,7 +262,7 @@ jobs:
286262
throw "No packaged artifact zip found in downloaded build output"
287263
}
288264
289-
$smokeRoot = Join-Path $env:RUNNER_TEMP "qbittorrent-smoke-${{ matrix.libt_variant }}"
265+
$smokeRoot = Join-Path $env:RUNNER_TEMP "qbittorrent-smoke-${{ env.libt_variant }}"
290266
New-Item -ItemType Directory -Path $smokeRoot -Force | Out-Null
291267
Expand-Archive -Path $zipFile.FullName -DestinationPath $smokeRoot -Force
292268
@@ -344,8 +320,7 @@ jobs:
344320
tag_name: v${{ env.qbt_version }}
345321
name: qBittorrent ${{ env.qbt_version }} (Windows ARM64 Native)
346322
files: |
347-
artifacts/arm64-native-lt12/qbittorrent_${{ env.qbt_version }}_arm64.zip
348-
artifacts/arm64-native-lt20/qbittorrent_${{ env.qbt_version }}_lt20_arm64.zip
323+
artifacts/${{ env.artifact_name }}/qbittorrent_${{ env.qbt_version }}${{ env.archive_suffix }}_arm64.zip
349324
draft: false
350325
prerelease: false
351326
body: |
@@ -355,10 +330,8 @@ jobs:
355330
- qBittorrent: ${{ env.qbt_version }}
356331
- Qt: ${{ env.qt_version }}
357332
- vcpkg triplet: ${{ env.vcpkg_triplet }}
358-
- libtorrent (lt12): 1.2.20+gitc5ff6c3186
359-
- Boost (lt12): 1.86.0
360-
- libtorrent (lt20): 2.0.13+gitda7a68a440
361-
- Boost (lt20): 1.91.0
333+
- libtorrent (${{ env.libt_variant }}): ${{ env.libt_version_display }}
334+
- Boost (${{ env.libt_variant }}): ${{ env.boost_version }}
362335
env:
363336
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
364337

@@ -368,10 +341,9 @@ jobs:
368341
with:
369342
tag_name: native-arm64-main-${{ github.run_number }}
370343
target_commitish: ${{ github.sha }}
371-
name: qBittorrent native ARM64 main release ${{ github.run_number }}
344+
name: qBittorrent native ARM64 ${{ github.run_number }}
372345
files: |
373-
artifacts/arm64-native-lt12/qbittorrent_${{ env.qbt_version }}_arm64.zip
374-
artifacts/arm64-native-lt20/qbittorrent_${{ env.qbt_version }}_lt20_arm64.zip
346+
artifacts/${{ env.artifact_name }}/qbittorrent_${{ env.qbt_version }}${{ env.archive_suffix }}_arm64.zip
375347
draft: false
376348
prerelease: false
377349
body: |
@@ -382,9 +354,7 @@ jobs:
382354
- qBittorrent: ${{ env.qbt_version }}
383355
- Qt: ${{ env.qt_version }}
384356
- vcpkg triplet: ${{ env.vcpkg_triplet }}
385-
- libtorrent (lt12): 1.2.20+gitc5ff6c3186
386-
- Boost (lt12): 1.86.0
387-
- libtorrent (lt20): 2.0.13+gitda7a68a440
388-
- Boost (lt20): 1.91.0
357+
- libtorrent (${{ env.libt_variant }}): ${{ env.libt_version_display }}
358+
- Boost (${{ env.libt_variant }}): ${{ env.boost_version }}
389359
env:
390360
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)