diff --git a/.github/workflows/windows-msi.yml b/.github/workflows/windows-msi.yml index 3020a179c..b88d277a7 100644 --- a/.github/workflows/windows-msi.yml +++ b/.github/workflows/windows-msi.yml @@ -35,7 +35,7 @@ jobs: - flavor: qt6 portable_artifact: qelectrotech-windows-portable-qt6 version_source: hardcoded # see note in "Extract version" step - label_suffix: "-qt6-EXPERIMENTAL" + label_suffix: "-qt6" experimental: true permissions: @@ -319,10 +319,10 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} REPO: ${{ github.repository }} run: | - $pattern = if ("${{ matrix.flavor }}" -eq "qt6") { "-qt6-EXPERIMENTAL.*\\.msi$" } else { "\\.msi$" } + $pattern = if ("${{ matrix.flavor }}" -eq "qt6") { "-qt6.*\\.msi$" } else { "\\.msi$" } $names = gh release view nightly --repo $env:REPO --json assets --jq ".assets[] | select(.name | test(`"$pattern`")) | .name" foreach ($name in ($names -split "`n" | Where-Object { $_ })) { - if ("${{ matrix.flavor }}" -eq "qt5" -and $name -match "-qt6-EXPERIMENTAL") { continue } + if ("${{ matrix.flavor }}" -eq "qt5" -and $name -match "-qt6") { continue } Write-Host "Deleting old asset: $name" gh release delete-asset nightly $name --repo $env:REPO --yes } diff --git a/build-aux/generate-page.py b/build-aux/generate-page.py index f6e3cf788..6ba06636b 100644 --- a/build-aux/generate-page.py +++ b/build-aux/generate-page.py @@ -5,7 +5,7 @@ Called from windows-msi.yml deploy-pages job. Environment variables required: DATE, SHORT, REPO, SHA, RUN_URL, RUN_NUMBER, INSTALLER_URL, PORTABLE_URL, MSI_URL (optional) -Optional (Qt6 experimental track — omitted entirely if empty): +Optional (Qt6 track — omitted entirely if empty): INSTALLER_QT6_URL, PORTABLE_QT6_URL, MSI_QT6_URL """ import os @@ -32,7 +32,7 @@ if msi_url: Windows Installer .msi.msi — for enterprise / GPO deployment """ -# Qt6 experimental section — only rendered if at least one Qt6 asset exists. +# Qt6 section — only rendered if at least one Qt6 asset exists. qt6_block = "" if installer_qt6_url or portable_qt6_url or msi_qt6_url: qt6_msi_btn = "" @@ -40,21 +40,21 @@ if installer_qt6_url or portable_qt6_url or msi_qt6_url: qt6_msi_btn = f""" ⬇ -Windows Installer .msi (Qt6).msi — experimental, for enterprise / GPO deployment +Windows Installer .msi (Qt6).msi — for enterprise / GPO deployment """ qt6_installer_btn = "" if installer_qt6_url: qt6_installer_btn = f""" ⬇ -Windows Installer (Qt6).exe — experimental, includes all dependencies +Windows Installer (Qt6).exe — includes all dependencies """ qt6_portable_btn = "" if portable_qt6_url: qt6_portable_btn = f""" 📦 -Windows Portable (Qt6).zip — experimental, no installation required +Windows Portable (Qt6).zip — no installation required """ qt6_block = f"""