From 3ed198b02b34a8ebf1b48a2b45119c9da69461ff Mon Sep 17 00:00:00 2001 From: adazem009 <68537469+adazem009@users.noreply.github.com> Date: Wed, 3 Sep 2025 18:30:51 +0200 Subject: [PATCH 1/6] Upgrade to Ubuntu 22.04 --- .github/workflows/linux-build.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index f1293c0..3799121 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: include: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4b7d3ef..e3ca884 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,7 @@ on: jobs: build-linux-release: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: include: From eef497baebd7b656a5c45c836ac147798ea9d707 Mon Sep 17 00:00:00 2001 From: adazem009 <68537469+adazem009@users.noreply.github.com> Date: Thu, 4 Sep 2025 08:49:31 +0200 Subject: [PATCH 2/6] Update mingw to 13.2.0 --- .github/workflows/windows-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index d6f3f80..916d4b3 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -15,7 +15,7 @@ jobs: qt-version: ['6.8'] qt-target: ['desktop'] qt-modules: [''] - mingw-version: ['11.2.0'] + mingw-version: ['13.2.0'] steps: - uses: actions/checkout@v3 with: From 5659bba59db16f6eb075b2483ff1bf1ea4b5c86f Mon Sep 17 00:00:00 2001 From: adazem009 <68537469+adazem009@users.noreply.github.com> Date: Thu, 4 Sep 2025 08:56:10 +0200 Subject: [PATCH 3/6] Update scratchcpp-render to latest master --- scratchcpp-render | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scratchcpp-render b/scratchcpp-render index e96c348..2f2d81d 160000 --- a/scratchcpp-render +++ b/scratchcpp-render @@ -1 +1 @@ -Subproject commit e96c3487005c8b086c95dbe14f5d8fb90e9cf50a +Subproject commit 2f2d81d217db0c3ec07db858103b5a5015f78b80 From 0f62b99fc07e820995fd8463f5c81799fedd0b6b Mon Sep 17 00:00:00 2001 From: adazem009 <68537469+adazem009@users.noreply.github.com> Date: Fri, 5 Sep 2025 11:52:42 +0200 Subject: [PATCH 4/6] test --- .github/workflows/windows-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 916d4b3..276dcb8 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -15,7 +15,7 @@ jobs: qt-version: ['6.8'] qt-target: ['desktop'] qt-modules: [''] - mingw-version: ['13.2.0'] + mingw-version: ['12.2.0'] steps: - uses: actions/checkout@v3 with: From 6b59737c67820796a9e0bdfba8aaee9eae9dffc1 Mon Sep 17 00:00:00 2001 From: adazem009 <68537469+adazem009@users.noreply.github.com> Date: Fri, 5 Sep 2025 12:02:21 +0200 Subject: [PATCH 5/6] Update cache action to v4 --- .github/workflows/linux-build.yml | 12 ++++++++---- .github/workflows/release.yml | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 3799121..b1bcb7e 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -70,7 +70,7 @@ jobs: - if: "!contains(matrix.arch, 'amd64')" name: Restore cross-compiled Qt from cache id: restore-qt-cross - uses: jlanga/cache/restore@remove-files + uses: actions/cache/restore@v4 with: path: ./qt-cross/ key: qt-cross-${{ runner.os }}-${{ matrix.qt-version }}-${{ matrix.qt-target }}-${{ matrix.qt-modules }}-${{ matrix.arch }} @@ -87,15 +87,19 @@ jobs: shell: bash run: .ci/build_qt6.sh "${{ matrix.qt-version }}" "${{ matrix.qt-modules }}" "${{ matrix.arch }}" - if: "!contains(matrix.arch, 'amd64') && steps.restore-qt-cross.outputs.cache-hit != 'true'" - name: Cache and remove cross-compiled Qt + name: Cache cross-compiled Qt id: cache-qt-cross - uses: jlanga/cache/save@remove-files + uses: actions/cache/save@v4 with: path: ./qt-cross/ key: qt-cross-${{ runner.os }}-${{ matrix.qt-version }}-${{ matrix.qt-target }}-${{ matrix.qt-modules }}-${{ matrix.arch }} + - if: "!contains(matrix.arch, 'amd64')" + name: Remove cross-compiled Qt + run: rm -rf qt-cross + shell: bash - if: "!contains(matrix.arch, 'amd64') && steps.restore-qt-cross.outputs.cache-hit != 'true'" name: Restore cross-compiled Qt from cache - uses: jlanga/cache/restore@remove-files + uses: actions/cache/restore@v4 with: path: ./qt-cross/ key: qt-cross-${{ runner.os }}-${{ matrix.qt-version }}-${{ matrix.qt-target }}-${{ matrix.qt-modules }}-${{ matrix.arch }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e3ca884..84fb24a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -82,7 +82,7 @@ jobs: - if: "!contains(matrix.arch, 'amd64')" name: Restore cross-compiled Qt from cache id: restore-qt-cross - uses: jlanga/cache/restore@remove-files + uses: actions/cache/restore@v4 with: path: ./qt-cross/ key: qt-cross-${{ runner.os }}-${{ matrix.qt-version }}-${{ matrix.qt-target }}-${{ matrix.qt-modules }}-${{ matrix.arch }} @@ -99,15 +99,19 @@ jobs: shell: bash run: .ci/build_qt6.sh "${{ matrix.qt-version }}" "${{ matrix.qt-modules }}" "${{ matrix.arch }}" - if: "!contains(matrix.arch, 'amd64') && steps.restore-qt-cross.outputs.cache-hit != 'true'" - name: Cache and remove cross-compiled Qt + name: Cache cross-compiled Qt id: cache-qt-cross - uses: jlanga/cache/save@remove-files + uses: actions/cache/save@v4 with: path: ./qt-cross/ key: qt-cross-${{ runner.os }}-${{ matrix.qt-version }}-${{ matrix.qt-target }}-${{ matrix.qt-modules }}-${{ matrix.arch }} + - if: "!contains(matrix.arch, 'amd64')" + name: Remove cross-compiled Qt + run: rm -rf qt-cross + shell: bash - if: "!contains(matrix.arch, 'amd64') && steps.restore-qt-cross.outputs.cache-hit != 'true'" name: Restore cross-compiled Qt from cache - uses: jlanga/cache/restore@remove-files + uses: actions/cache/restore@v4 with: path: ./qt-cross/ key: qt-cross-${{ runner.os }}-${{ matrix.qt-version }}-${{ matrix.qt-target }}-${{ matrix.qt-modules }}-${{ matrix.arch }} From c1481ceada151c131fd8108cd76eec0949233778 Mon Sep 17 00:00:00 2001 From: adazem009 <68537469+adazem009@users.noreply.github.com> Date: Tue, 11 Nov 2025 16:04:23 +0100 Subject: [PATCH 6/6] Change Windows build directory --- .github/workflows/windows-build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 276dcb8..718cd15 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -57,15 +57,15 @@ jobs: version: ${{ matrix.mingw-version }} ## Build - name: Windows build - run: .ci/common/build.sh win_build win64 + run: .ci/common/build.sh 'D:/w' win64 shell: bash - name: Deploy run: | mkdir win_release - for /r win_build %%f in (${{ env.executable_name }}.exe) do @move "%%f" win_release - for /r win_build %%f in (*.dll) do @move "%%f" win_release + for /r D:\w %%f in (${{ env.executable_name }}.exe) do @move "%%f" win_release + for /r D:\w %%f in (*.dll) do @move "%%f" win_release cd win_release - windeployqt ${{ env.executable_name }}.exe --qmldir ..\win_build\src || exit 5 + windeployqt ${{ env.executable_name }}.exe --qmldir D:\w\src || exit 5 shell: cmd - name: Copy libraries run: |