mirror of
https://github.com/sqlitebrowser/sqlitebrowser.git
synced 2025-12-17 17:45:20 -06:00
Upgrade the Windows CI runner version to 2022
This commit is contained in:
9
.github/workflows/cppcmake-windows.yml
vendored
9
.github/workflows/cppcmake-windows.yml
vendored
@@ -16,7 +16,7 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
arch: [x86, x64]
|
||||
os: [windows-2019]
|
||||
os: [windows-2022]
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
OPENSSL_VERSION: 1.1.1.2100
|
||||
@@ -52,10 +52,14 @@ jobs:
|
||||
cache-key-prefix: "cache"
|
||||
version: ${{ env.QT_VERSION }}
|
||||
|
||||
- name: Install VS2019
|
||||
run: choco install visualstudio2019community --package-parameters "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.Windows10SDK.19041 --add Microsoft.VisualStudio.Component.VC.Redist.MSM"
|
||||
|
||||
- name: Setup MSVC
|
||||
uses: ilammy/msvc-dev-cmd@v1
|
||||
with:
|
||||
arch: ${{ matrix.arch == 'x86' && 'amd64_x86' || matrix.arch == 'x64' && 'amd64'}}
|
||||
vsversion: 2019
|
||||
|
||||
- name: Build SQLite
|
||||
run: |
|
||||
@@ -73,7 +77,8 @@ jobs:
|
||||
- name: Download SQLean extension
|
||||
run: |
|
||||
if ("${{ matrix.arch }}" -eq "x86") {
|
||||
gh release download --pattern "sqlean-win-x86.zip" --repo "nalgeon/sqlean"
|
||||
# sqlean has discontinued x86 support starting from v0.28.0
|
||||
gh release download 0.27.4 --pattern "sqlean-win-x86.zip" --repo "nalgeon/sqlean"
|
||||
Expand-Archive -Path sqlean-win-x86.zip -DestinationPath .\sqlean
|
||||
} else {
|
||||
gh release download --pattern "sqlean-win-x64.zip" --repo "nalgeon/sqlean"
|
||||
|
||||
26
.github/workflows/cppcmake.yml
vendored
26
.github/workflows/cppcmake.yml
vendored
@@ -55,18 +55,17 @@ jobs:
|
||||
with:
|
||||
NIGHTLY: ${{ github.event_name == 'schedule' || inputs.NIGHTLY == true }}
|
||||
|
||||
# build-windows:
|
||||
# needs: check-skippable
|
||||
# if: needs.check-skippable.outputs.skip != 'true'
|
||||
# uses: ./.github/workflows/cppcmake-windows.yml
|
||||
# secrets: inherit
|
||||
# with:
|
||||
# NIGHTLY: ${{ github.event_name == 'schedule' || inputs.NIGHTLY == true }}
|
||||
build-windows:
|
||||
needs: check-skippable
|
||||
if: needs.check-skippable.outputs.skip != 'true'
|
||||
uses: ./.github/workflows/cppcmake-windows.yml
|
||||
secrets: inherit
|
||||
with:
|
||||
NIGHTLY: ${{ github.event_name == 'schedule' || inputs.NIGHTLY == true }}
|
||||
|
||||
release:
|
||||
if: github.event_name != 'pull_request'
|
||||
needs: [build-macos, build-ubuntu]
|
||||
# needs: [build-macos, build-ubuntu, build-windows]
|
||||
needs: [build-macos, build-ubuntu, build-windows]
|
||||
name: Release
|
||||
runs-on: ubuntu-24.04
|
||||
env:
|
||||
@@ -84,18 +83,17 @@ jobs:
|
||||
with:
|
||||
path: target
|
||||
|
||||
# - name: Remove unsigned Windows build
|
||||
# run: rm -rfv target/*unsigned*
|
||||
- name: Remove unsigned Windows build
|
||||
run: rm -rfv target/*unsigned*
|
||||
|
||||
- run: find target -type f -exec mv -v {} target \;
|
||||
|
||||
# - name: Unarchive Windows's build artifacts
|
||||
# run: for f in target/*.zip; do unzip -d target/ "$f" && rm -v "$f"; done
|
||||
- name: Unarchive Windows's build artifacts
|
||||
run: for f in target/*.zip; do unzip -d target/ "$f" && rm -v "$f"; done
|
||||
|
||||
- name: Release
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
body: "The Windows build will not be provided for the time being. Note: #3967"
|
||||
files: target/*
|
||||
prerelease: true
|
||||
tag_name: ${{ env.tag_name }}
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
Visual Studio 2017. The build "ARCH" will be set automatically.
|
||||
-->
|
||||
|
||||
<?define VCRedistPath="C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Redist\MSVC\14.29.30133\MergeModules" ?>
|
||||
<?define VCRedistPath="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.29.30133\MergeModules" ?>
|
||||
<?define VCRedistFile="Microsoft_VC142_CRT_$(sys.BUILDARCH).msm" ?>
|
||||
|
||||
<!--
|
||||
|
||||
Reference in New Issue
Block a user