diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index f1293c0..b1bcb7e 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: @@ -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 4b7d3ef..84fb24a 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: @@ -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 }} diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index d6f3f80..718cd15 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: ['12.2.0'] steps: - uses: actions/checkout@v3 with: @@ -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: | 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