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
4 changes: 2 additions & 2 deletions .github/workflows/build_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:
required: false
use_qt69:
description: 'Use Qt 6.9'
default: 'off'
default: 'on'
required: false
workflow_call:
inputs:
Expand Down Expand Up @@ -57,7 +57,7 @@ on:
required: false
use_qt69:
description: 'Use Qt 6.9'
default: 'off'
default: 'on'
type: string
required: false

Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/build_backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
required: false
use_qt69:
description: 'Use Qt 6.9'
default: 'off'
default: 'on'
required: false
workflow_call:
inputs:
Expand All @@ -41,10 +41,13 @@ on:
required: false
use_qt69:
description: 'Use Qt 6.9'
default: 'off'
default: 'on'
type: string
required: false

env:
USE_QT69: ${{ inputs.use_qt69 != '' && inputs.use_qt69 || 'on' }}

jobs:
backend:
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -101,10 +104,10 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: ${{ inputs.use_qt69 == 'on' && '6.9.*' || '6.2.4' }}
version: ${{ env.USE_QT69 == 'on' && '6.9.1' || '6.2.4' }}
host: 'linux'
target: 'desktop'
arch: ${{ inputs.use_qt69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
arch: ${{ env.USE_QT69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'

- name: Setup environment
Expand Down
30 changes: 22 additions & 8 deletions .github/workflows/build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
required: false
use_qt69:
description: 'Use Qt 6.9'
default: 'off'
default: 'on'
required: false
workflow_call:
inputs:
Expand All @@ -48,12 +48,25 @@ on:
required: false
use_qt69:
description: 'Use Qt 6.9'
default: 'off'
default: 'on'
type: string
required: false
required: false

env:
USE_QT69: ${{ inputs.use_qt69 != '' && inputs.use_qt69 || 'on' }}

jobs:
setup:
runs-on: ubuntu-22.04
outputs:
use_qt69: ${{ steps.set_use_qt69.outputs.use_qt69 }}
steps:
- id: set_use_qt69
run: |
echo "use_qt69=${{ env.USE_QT69 }}" >> $GITHUB_OUTPUT

build:
needs: setup
if: github.event_name != 'workflow_dispatch' || contains(inputs.platforms, 'linux_x64') || contains(inputs.platforms, 'linux_arm64')
runs-on: ${{ matrix.runs-on }}
strategy:
Expand All @@ -72,11 +85,12 @@ jobs:
arch: x86_64
runs-on: ubuntu-22.04
qt-host: linux
qt-arch: ${{ inputs.use_qt69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
qt-version: ${{ needs.setup.outputs.use_qt69 == 'on' && '6.9.1' || '6.2.4' }}
qt-arch: ${{ needs.setup.outputs.use_qt69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
dump-symbols-arch: x86-64
- platform: linux_arm64
arch: aarch64
runs-on: ${{ inputs.use_qt69 == 'on' && 'ubuntu-24.04-arm' || 'ubuntu-22.04-arm' }}
runs-on: ${{ needs.setup.outputs.use_qt69 == 'on' && 'ubuntu-24.04-arm' || 'ubuntu-22.04-arm' }}
qt-host: linux_arm64
qt-arch: linux_gcc_arm64
dump-symbols-arch: aarch64
Expand Down Expand Up @@ -181,15 +195,15 @@ jobs:

- name: Install Qt
uses: jurplel/install-qt-action@v4
if: ${{ !(matrix.qt-host == 'linux_arm64' && inputs.use_qt69 != 'on') }}
if: ${{ !(matrix.qt-host == 'linux_arm64' && env.USE_QT69 != 'on') }}
with:
version: ${{ inputs.use_qt69 == 'on' && '6.9.*' || '6.2.4' }}
version: ${{ env.USE_QT69 == 'on' && '6.9.1' || '6.2.4' }}
host: ${{ matrix.qt-host }}
target: 'desktop'
arch: ${{ matrix.qt-arch }}
modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
- name: Install Qt 6.2.4 arm64
if: ${{ matrix.qt-host == 'linux_arm64' && inputs.use_qt69 != 'on' }}
if: ${{ matrix.qt-host == 'linux_arm64' && env.USE_QT69 != 'on' }}
run: |
bash ./buildscripts/ci/linux/arm64/install_qt.sh
- name: Setup environment
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build_linux_arm32.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Build: Linux arm32'

on:
# pull_request:
#pull_request:
workflow_dispatch:
inputs:
build_mode:
Expand All @@ -18,7 +18,7 @@ on:
required: false
use_qt69:
description: 'Use Qt 6.9'
default: 'off'
default: 'on'
required: false
workflow_call:
inputs:
Expand All @@ -39,9 +39,9 @@ on:
required: false
use_qt69:
description: 'Use Qt 6.9'
default: 'off'
default: 'on'
type: string
required: false
required: false

jobs:
linux_arm32:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/build_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
required: false
use_qt69:
description: 'Use Qt 6.9'
default: 'off'
default: 'on'
required: false
workflow_call:
inputs:
Expand All @@ -39,12 +39,13 @@ on:
required: false
use_qt69:
description: 'Use Qt 6.9'
default: 'off'
default: 'on'
type: string
required: false

env:
DEVELOPER_DIR: /Applications/Xcode_16.3.app/Contents/Developer
USE_QT69: ${{ inputs.use_qt69 != '' && inputs.use_qt69 || 'on' }}

jobs:
macos_universal:
Expand Down Expand Up @@ -163,7 +164,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: ${{ inputs.use_qt69 == 'on' && '6.9.*' || '6.2.4' }}
version: ${{ env.USE_QT69 == 'on' && '6.9.1' || '6.2.4' }}
host: 'mac'
target: 'desktop'
arch: 'clang_64'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ jobs:
build_mode: 'nightly',
publish: 'on',
sentry_project: 'sandbox',
use_qt69: 'off'
use_qt69: 'on'
}
})
17 changes: 10 additions & 7 deletions .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
required: false
use_qt69:
description: 'Use Qt 6.9'
default: 'off'
default: 'on'
required: false
workflow_call:
inputs:
Expand All @@ -48,10 +48,13 @@ on:
required: false
use_qt69:
description: 'Use Qt 6.9'
default: 'off'
default: 'on'
type: string
required: false

env:
USE_QT69: ${{ inputs.use_qt69 != '' && inputs.use_qt69 || 'on' }}

jobs:
windows_x64:
if: github.event_name != 'workflow_dispatch' || contains(inputs.platforms, 'windows_x64')
Expand Down Expand Up @@ -158,15 +161,15 @@ jobs:

- name: Install Qt
uses: jurplel/install-qt-action@v4
if: ${{ inputs.use_qt69 == 'on' }}
if: ${{ env.USE_QT69 == 'on' }}
with:
version: ${{ inputs.use_qt69 == 'on' && '6.9.*' || '6.2.4' }}
version: '6.9.1'
host: 'windows'
target: 'desktop'
arch: ${{ inputs.use_qt69 == 'on' && 'win64_msvc2022_64' || 'win64_msvc2019_64' }}
arch: 'win64_msvc2022_64'
modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
- name: Install Qt 6.2.11
if: ${{ inputs.use_qt69 != 'on' }}
if: ${{ env.USE_QT69 != 'on' }}
run: |
buildscripts\ci\windows\install_qt_6_2_11.bat
- name: Setup environment
Expand Down Expand Up @@ -309,7 +312,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: '6.9.*'
version: '6.9.1'
host: 'windows'
target: 'desktop'
arch: 'win64_msvc2022_64'
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/check_unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@ on:
default: 'false'
use_qt69:
description: 'Use Qt 6.9'
default: 'off'
default: 'on'
required: false
schedule:
- cron: "0 3 * * 4" # Every Thursday night at 03:00 for master branch

env:
USE_QT69: ${{ inputs.use_qt69 != '' && inputs.use_qt69 || 'on' }}

jobs:
run_tests:
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -53,10 +56,10 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: ${{ inputs.use_qt69 == 'on' && '6.9.*' || '6.2.4' }}
version: ${{ env.USE_QT69 == 'on' && '6.9.1' || '6.2.4' }}
host: 'linux'
target: 'desktop'
arch: ${{ inputs.use_qt69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
arch: ${{ env.USE_QT69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
- name: Setup environment
run: |
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/check_visual_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@ on:
inputs:
use_qt69:
description: 'Use Qt 6.9'
default: 'off'
default: 'on'
required: false

env:
USE_QT69: ${{ inputs.use_qt69 != '' && inputs.use_qt69 || 'on' }}

jobs:
setup:
name: "Setup VTests workflow"
Expand Down Expand Up @@ -87,10 +91,10 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: ${{ inputs.use_qt69 == 'on' && '6.9.*' || '6.2.4' }}
version: ${{ env.USE_QT69 == 'on' && '6.9.1' || '6.2.4' }}
host: 'linux'
target: 'desktop'
arch: ${{ inputs.use_qt69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
arch: ${{ env.USE_QT69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
- name: Setup environment
run: |
Expand Down Expand Up @@ -134,10 +138,10 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: ${{ inputs.use_qt69 == 'on' && '6.9.*' || '6.2.4' }}
version: ${{ env.USE_QT69 == 'on' && '6.9.1' || '6.2.4' }}
host: 'linux'
target: 'desktop'
arch: ${{ inputs.use_qt69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
arch: ${{ env.USE_QT69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
modules: 'qt5compat qtnetworkauth qtscxml qtshadertools qtwebsockets'
- name: Setup environment
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
default: false
use_qt69:
description: 'Use Qt 6.9'
default: 'off'
default: 'on'
required: false

defaults:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/translate_lupdate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
default: false
use_qt69:
description: 'Use Qt 6.9'
default: 'off'
default: 'on'
required: false
schedule:
- cron: "0 12 * * Sun"
Expand All @@ -35,7 +35,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: ${{ inputs.use_qt69 == 'on' && '6.9.*' || '6.2.4' }}
version: ${{ inputs.use_qt69 == 'on' && '6.9.1' || '6.2.4' }}
host: "linux"
target: "desktop"
arch: ${{ inputs.use_qt69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/translate_tx_pull_to_s3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,12 @@ on:
default: false
use_qt69:
description: "Use Qt 6.9"
default: "off"
default: "on"
required: false

env:
USE_QT69: ${{ inputs.use_qt69 != '' && inputs.use_qt69 || 'on' }}

jobs:
tx_pull:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -76,10 +79,10 @@ jobs:
if: env.DO_PUSH_TO_S3 == 'true'
uses: jurplel/install-qt-action@v4
with:
version: ${{ inputs.use_qt69 == 'on' && '6.9.*' || '6.2.4' }}
version: ${{ env.USE_QT69 == 'on' && '6.9.1' || '6.2.4' }}
host: "linux"
target: "desktop"
arch: ${{ inputs.use_qt69 == 'on' && 'linux_gcc_64' || 'gcc_64' }}
arch: ${{ env.USE_QT69== 'on' && 'linux_gcc_64' || 'gcc_64' }}
archives: "qttools qtbase icu"

- name: Setup environment for pushing to S3
Expand Down
Loading