Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 45 additions & 5 deletions .github/workflows/build-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ jobs:
- name: Build MacOS binaries
run: ./scripts/cmake-build-mac.sh -g
env:
MAC_QT_DIR: ${{ env.Qt5_DIR }}
MAC_QT_DIR: ${{ env.QT_ROOT_DIR }}

- name: Create MacOS dmg sha256 checksum file
run: |
Expand Down Expand Up @@ -219,7 +219,7 @@ jobs:
# ==========================================================================
# Build Windows x64 version
buildWindows:
runs-on: windows-latest
runs-on: windows-2022
needs: prepareRelease
outputs:
upload_url: ${{ needs.prepareRelease.outputs.upload_url }}
Expand All @@ -237,19 +237,39 @@ jobs:
setup-python: 'false'
modules: 'qtwebengine'

- name: Provide build tools on PATH (pinned 2021 vcpkg's own download URLs are dead)
# bzip2 fetches msys2 pkg-config; openssl fetches Strawberry Perl and NASM.
# Those URLs are dead, so install the tools and let vcpkg find them on PATH.
run: |
choco install pkgconfiglite strawberryperl nasm -y --no-progress
# choco only updates the machine PATH in the registry, which GitHub Actions
# does not carry into later steps. vcpkg's openssl port runs find_program(perl)
# against the step PATH, so without this it falls back to the dead download URL.
# Push Strawberry Perl's bin dirs onto GITHUB_PATH so run-vcpkg finds perl.
"C:\Strawberry\c\bin", "C:\Strawberry\perl\site\bin", "C:\Strawberry\perl\bin" |
Where-Object { Test-Path $_ } |
ForEach-Object { Add-Content -Path $env:GITHUB_PATH -Value $_ }

- name: Install vcpkg and packages with cache
uses: lukka/run-vcpkg@v6
with:
vcpkgArguments: 'berkeleydb boost leveldb openssl'
vcpkgGitCommitId: a037d826492039db9d58af47a1e1248037d15f40
vcpkgTriplet: x64-windows
env:
# Old vcpkg ports (e.g. bzip2) declare cmake_minimum_required < 3.5,
# which CMake 4.x rejects as a fatal error. Restore the old floor.
CMAKE_POLICY_VERSION_MINIMUM: '3.5'
# Use overlay triplets that hand vcpkg a local pkg-config, so bzip2's
# vcpkg_fixup_pkgconfig does not fetch the removed msys2 package.
VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/vcpkg-overlay-triplets

- name: Build Windows binaries
run: ./scripts/cmake-build-win.bat
env:
VCPKG_DEFAULT_TRIPLET: x64-windows
QTDIR: ${{ env.Qt5_Dir }}
VSDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise'
VSDIR: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise'
CMAKEDIR: 'C:\Program Files\CMake\bin'
VCPKGDIR: ${{ github.workspace }}/vcpkg

Expand Down Expand Up @@ -283,7 +303,7 @@ jobs:
# ==========================================================================
# Build Windows x86 version
buildWindowsX86:
runs-on: windows-latest
runs-on: windows-2022
needs: prepareRelease
outputs:
upload_url: ${{ needs.prepareRelease.outputs.upload_url }}
Expand All @@ -302,19 +322,39 @@ jobs:
modules: 'qtwebengine'
arch: 'win32_msvc2017'

- name: Provide build tools on PATH (pinned 2021 vcpkg's own download URLs are dead)
# bzip2 fetches msys2 pkg-config; openssl fetches Strawberry Perl and NASM.
# Those URLs are dead, so install the tools and let vcpkg find them on PATH.
run: |
choco install pkgconfiglite strawberryperl nasm -y --no-progress
# choco only updates the machine PATH in the registry, which GitHub Actions
# does not carry into later steps. vcpkg's openssl port runs find_program(perl)
# against the step PATH, so without this it falls back to the dead download URL.
# Push Strawberry Perl's bin dirs onto GITHUB_PATH so run-vcpkg finds perl.
"C:\Strawberry\c\bin", "C:\Strawberry\perl\site\bin", "C:\Strawberry\perl\bin" |
Where-Object { Test-Path $_ } |
ForEach-Object { Add-Content -Path $env:GITHUB_PATH -Value $_ }

- name: Install vcpkg and packages with cache
uses: lukka/run-vcpkg@v6
with:
vcpkgArguments: 'berkeleydb boost leveldb openssl'
vcpkgGitCommitId: a037d826492039db9d58af47a1e1248037d15f40
vcpkgTriplet: x86-windows
env:
# Old vcpkg ports (e.g. bzip2) declare cmake_minimum_required < 3.5,
# which CMake 4.x rejects as a fatal error. Restore the old floor.
CMAKE_POLICY_VERSION_MINIMUM: '3.5'
# Use overlay triplets that hand vcpkg a local pkg-config, so bzip2's
# vcpkg_fixup_pkgconfig does not fetch the removed msys2 package.
VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/vcpkg-overlay-triplets

- name: Build Windows binaries
run: ./scripts/cmake-build-win-x86.bat
env:
VCPKG_DEFAULT_TRIPLET: x86-windows
QTDIR_x86: ${{ env.Qt5_Dir }}
VSDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise'
VSDIR: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise'
CMAKEDIR_x86: 'C:\Program Files\CMake\bin'
VCPKGDIR: ${{ github.workspace }}/vcpkg

Expand Down
28 changes: 24 additions & 4 deletions .github/workflows/build-featurebranch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,18 @@ jobs:
version: '5.12.9'
setup-python: 'false'
modules: 'qtwebengine'
- name: Install pkg-config (pinned vcpkg's msys2 pkg-config mirror is dead)
run: choco install pkgconfiglite -y --no-progress
- name: Provide build tools on PATH (pinned 2021 vcpkg's own download URLs are dead)
# bzip2 fetches msys2 pkg-config; openssl fetches Strawberry Perl and NASM.
# Those URLs are dead, so install the tools and let vcpkg find them on PATH.
run: |
choco install pkgconfiglite strawberryperl nasm -y --no-progress
# choco only updates the machine PATH in the registry, which GitHub Actions
# does not carry into later steps. vcpkg's openssl port runs find_program(perl)
# against the step PATH, so without this it falls back to the dead download URL.
# Push Strawberry Perl's bin dirs onto GITHUB_PATH so run-vcpkg finds perl.
"C:\Strawberry\c\bin", "C:\Strawberry\perl\site\bin", "C:\Strawberry\perl\bin" |
Where-Object { Test-Path $_ } |
ForEach-Object { Add-Content -Path $env:GITHUB_PATH -Value $_ }
- name: Install vcpkg and packages with cache
uses: lukka/run-vcpkg@v6
with:
Expand Down Expand Up @@ -150,8 +160,18 @@ jobs:
setup-python: 'false'
modules: 'qtwebengine'
arch: 'win32_msvc2017'
- name: Install pkg-config (pinned vcpkg's msys2 pkg-config mirror is dead)
run: choco install pkgconfiglite -y --no-progress
- name: Provide build tools on PATH (pinned 2021 vcpkg's own download URLs are dead)
# bzip2 fetches msys2 pkg-config; openssl fetches Strawberry Perl and NASM.
# Those URLs are dead, so install the tools and let vcpkg find them on PATH.
run: |
choco install pkgconfiglite strawberryperl nasm -y --no-progress
# choco only updates the machine PATH in the registry, which GitHub Actions
# does not carry into later steps. vcpkg's openssl port runs find_program(perl)
# against the step PATH, so without this it falls back to the dead download URL.
# Push Strawberry Perl's bin dirs onto GITHUB_PATH so run-vcpkg finds perl.
"C:\Strawberry\c\bin", "C:\Strawberry\perl\site\bin", "C:\Strawberry\perl\bin" |
Where-Object { Test-Path $_ } |
ForEach-Object { Add-Content -Path $env:GITHUB_PATH -Value $_ }
- name: Install vcpkg and packages with cache
uses: lukka/run-vcpkg@v6
with:
Expand Down
50 changes: 45 additions & 5 deletions .github/workflows/build-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ jobs:
- name: Build MacOS binaries
run: ./scripts/cmake-build-mac.sh -g
env:
MAC_QT_DIR: ${{ env.Qt5_DIR }}
MAC_QT_DIR: ${{ env.QT_ROOT_DIR }}

- name: Create MacOS dmg sha256 checksum file
run: |
Expand Down Expand Up @@ -215,7 +215,7 @@ jobs:
# ==========================================================================
# Build Windows x64 version
buildWindows:
runs-on: windows-latest
runs-on: windows-2022
needs: prepareRelease
outputs:
upload_url: ${{ needs.prepareRelease.outputs.upload_url }}
Expand All @@ -233,19 +233,39 @@ jobs:
setup-python: 'false'
modules: 'qtwebengine'

- name: Provide build tools on PATH (pinned 2021 vcpkg's own download URLs are dead)
# bzip2 fetches msys2 pkg-config; openssl fetches Strawberry Perl and NASM.
# Those URLs are dead, so install the tools and let vcpkg find them on PATH.
run: |
choco install pkgconfiglite strawberryperl nasm -y --no-progress
# choco only updates the machine PATH in the registry, which GitHub Actions
# does not carry into later steps. vcpkg's openssl port runs find_program(perl)
# against the step PATH, so without this it falls back to the dead download URL.
# Push Strawberry Perl's bin dirs onto GITHUB_PATH so run-vcpkg finds perl.
"C:\Strawberry\c\bin", "C:\Strawberry\perl\site\bin", "C:\Strawberry\perl\bin" |
Where-Object { Test-Path $_ } |
ForEach-Object { Add-Content -Path $env:GITHUB_PATH -Value $_ }

- name: Install vcpkg and packages with cache
uses: lukka/run-vcpkg@v6
with:
vcpkgArguments: 'berkeleydb boost leveldb openssl'
vcpkgGitCommitId: a037d826492039db9d58af47a1e1248037d15f40
vcpkgTriplet: x64-windows
env:
# Old vcpkg ports (e.g. bzip2) declare cmake_minimum_required < 3.5,
# which CMake 4.x rejects as a fatal error. Restore the old floor.
CMAKE_POLICY_VERSION_MINIMUM: '3.5'
# Use overlay triplets that hand vcpkg a local pkg-config, so bzip2's
# vcpkg_fixup_pkgconfig does not fetch the removed msys2 package.
VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/vcpkg-overlay-triplets

- name: Build Windows binaries
run: ./scripts/cmake-build-win.bat
env:
VCPKG_DEFAULT_TRIPLET: x64-windows
QTDIR: ${{ env.Qt5_Dir }}
VSDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise'
VSDIR: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise'
CMAKEDIR: 'C:\Program Files\CMake\bin'
VCPKGDIR: ${{ github.workspace }}/vcpkg

Expand Down Expand Up @@ -279,7 +299,7 @@ jobs:
# ==========================================================================
# Build Windows x86 version
buildWindowsX86:
runs-on: windows-latest
runs-on: windows-2022
needs: prepareRelease
outputs:
upload_url: ${{ needs.prepareRelease.outputs.upload_url }}
Expand All @@ -298,19 +318,39 @@ jobs:
modules: 'qtwebengine'
arch: 'win32_msvc2017'

- name: Provide build tools on PATH (pinned 2021 vcpkg's own download URLs are dead)
# bzip2 fetches msys2 pkg-config; openssl fetches Strawberry Perl and NASM.
# Those URLs are dead, so install the tools and let vcpkg find them on PATH.
run: |
choco install pkgconfiglite strawberryperl nasm -y --no-progress
# choco only updates the machine PATH in the registry, which GitHub Actions
# does not carry into later steps. vcpkg's openssl port runs find_program(perl)
# against the step PATH, so without this it falls back to the dead download URL.
# Push Strawberry Perl's bin dirs onto GITHUB_PATH so run-vcpkg finds perl.
"C:\Strawberry\c\bin", "C:\Strawberry\perl\site\bin", "C:\Strawberry\perl\bin" |
Where-Object { Test-Path $_ } |
ForEach-Object { Add-Content -Path $env:GITHUB_PATH -Value $_ }

- name: Install vcpkg and packages with cache
uses: lukka/run-vcpkg@v6
with:
vcpkgArguments: 'berkeleydb boost leveldb openssl'
vcpkgGitCommitId: a037d826492039db9d58af47a1e1248037d15f40
vcpkgTriplet: x86-windows
env:
# Old vcpkg ports (e.g. bzip2) declare cmake_minimum_required < 3.5,
# which CMake 4.x rejects as a fatal error. Restore the old floor.
CMAKE_POLICY_VERSION_MINIMUM: '3.5'
# Use overlay triplets that hand vcpkg a local pkg-config, so bzip2's
# vcpkg_fixup_pkgconfig does not fetch the removed msys2 package.
VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/vcpkg-overlay-triplets

- name: Build Windows binaries
run: ./scripts/cmake-build-win-x86.bat
env:
VCPKG_DEFAULT_TRIPLET: x86-windows
QTDIR_x86: ${{ env.Qt5_Dir }}
VSDIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise'
VSDIR: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise'
CMAKEDIR_x86: 'C:\Program Files\CMake\bin'
VCPKGDIR: ${{ github.workspace }}/vcpkg

Expand Down
Loading