From 1994a169e6db2ec8bfd61ad0af853d3055f583bd Mon Sep 17 00:00:00 2001 From: Alin Copindean Date: Tue, 21 Oct 2025 22:23:14 +0300 Subject: [PATCH 1/7] CI build config --- .github/workflows/ci-build.yml | 40 ++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/workflows/ci-build.yml diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml new file mode 100644 index 0000000..ae21426 --- /dev/null +++ b/.github/workflows/ci-build.yml @@ -0,0 +1,40 @@ +name: ci-build + +on: + push: + branches: + - main + - develop + pull_request: + branches: + - main + - develop + +jobs: + build: + runs-on: windows-latest + + env: + Qt6_DIR: 'C:\Qt\6.8.3\msvc2022_64\lib\cmake\Qt6' + + steps: + # Checkout repo + - name: Checkout repository + uses: actions/checkout@v3 + + # Set up MSVC environment + - name: Setup MSVC 2022 + uses: microsoft/setup-msbuild@v1.1 + + # Configure CMake + - name: Configure CMake + run: | + mkdir build + cd build + cmake .. -G "Visual Studio 17 2022" -A x64 -DQt6_DIR=%Qt6_DIR% + + # Build + - name: Build project + run: | + cd build + cmake --build . --config Release From 581d0e7d9e2f6928377b7c43e298657fdbbf8d1d Mon Sep 17 00:00:00 2001 From: Alin Copindean Date: Tue, 21 Oct 2025 22:26:56 +0300 Subject: [PATCH 2/7] activate ci build only for PR to main --- .github/workflows/ci-build.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index ae21426..170dbd9 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -1,14 +1,10 @@ name: ci-build on: - push: - branches: - - main - - develop pull_request: branches: - main - - develop + jobs: build: From 117fd4dbfd9d8341d04774b8c0fc717db369bcf1 Mon Sep 17 00:00:00 2001 From: Alin Copindean Date: Tue, 21 Oct 2025 22:32:11 +0300 Subject: [PATCH 3/7] install qt6 via chocolatey --- .github/workflows/ci-build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 170dbd9..33c7177 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -22,6 +22,11 @@ jobs: - name: Setup MSVC 2022 uses: microsoft/setup-msbuild@v1.1 + # Install Qt6 via Chocolatey + # -y parameter for "yes" option during install + - name: Install Qt6 + run: choco install qt6 --version=6.8.3 -y + # Configure CMake - name: Configure CMake run: | From 0f1dc5c347ce4268bfe99e65ad8c4ecee7a44510 Mon Sep 17 00:00:00 2001 From: Alin Copindean Date: Tue, 21 Oct 2025 22:38:56 +0300 Subject: [PATCH 4/7] Install QT using Github actions Using script from Jurplel marketplace github --- .github/workflows/ci-build.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 33c7177..d805777 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -24,15 +24,25 @@ jobs: # Install Qt6 via Chocolatey # -y parameter for "yes" option during install - - name: Install Qt6 - run: choco install qt6 --version=6.8.3 -y + #- name: Install Qt6 + # run: choco install qt6 --version=6.8.3 -y + + # Qt6 is not available in Chocolatey + # Use Jurplel from Github Action + # Install Qt + - name: Install Qt + uses: jurplel/install-qt-action@v4.3.0 + with: + version: 6.8.3 + arch: win64 + target: desktop # Configure CMake - name: Configure CMake run: | mkdir build cd build - cmake .. -G "Visual Studio 17 2022" -A x64 -DQt6_DIR=%Qt6_DIR% + cmake .. -G "Visual Studio 17 2022" -A x64 -DQt6_DIR="%LOCALAPPDATA%\Qt\6.8.3\msvc2022_64\lib\cmake\Qt6" # Build - name: Build project From b8352a5f0bd11337e0fef293c1962c335badca4f Mon Sep 17 00:00:00 2001 From: Alin Copindean Date: Tue, 21 Oct 2025 22:41:38 +0300 Subject: [PATCH 5/7] update QT6 Dir --- .github/workflows/ci-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index d805777..e05ad9c 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -11,7 +11,7 @@ jobs: runs-on: windows-latest env: - Qt6_DIR: 'C:\Qt\6.8.3\msvc2022_64\lib\cmake\Qt6' + Qt6_DIR: ${{ env.LOCALAPPDATA }}\Qt\6.8.3\msvc2022_64\lib\cmake\Qt6 steps: # Checkout repo From 49eae453a60e6cd83c3f5b19d0fb87977bdee950 Mon Sep 17 00:00:00 2001 From: Alin Copindean Date: Tue, 21 Oct 2025 22:45:17 +0300 Subject: [PATCH 6/7] Revert "update QT6 Dir" This reverts commit b8352a5f0bd11337e0fef293c1962c335badca4f. --- .github/workflows/ci-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index e05ad9c..d805777 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -11,7 +11,7 @@ jobs: runs-on: windows-latest env: - Qt6_DIR: ${{ env.LOCALAPPDATA }}\Qt\6.8.3\msvc2022_64\lib\cmake\Qt6 + Qt6_DIR: 'C:\Qt\6.8.3\msvc2022_64\lib\cmake\Qt6' steps: # Checkout repo From f0aa894d81955c448c303306c27d4aed31253dae Mon Sep 17 00:00:00 2001 From: Alin Copindean Date: Tue, 21 Oct 2025 22:48:17 +0300 Subject: [PATCH 7/7] add modules for qt6 installation --- .github/workflows/ci-build.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index d805777..ae987ad 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -33,9 +33,12 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4.3.0 with: - version: 6.8.3 - arch: win64 - target: desktop + version: 6.8.3 + arch: win64 + target: desktop + dir: ${{ runner.temp }}/Qt + modules: qtbase,qtnetwork,qtsql + set-env: true # Configure CMake - name: Configure CMake