From 5e96fe7fe00408d8ccae6f7e32499bfbda939eb8 Mon Sep 17 00:00:00 2001 From: Nerixyz Date: Wed, 4 Oct 2023 23:10:12 +0200 Subject: [PATCH 1/6] ci: add Qt 6.5.0 builds --- .github/workflows/QtApng.yml | 7 +++++++ .github/workflows/kimageformats.yml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/.github/workflows/QtApng.yml b/.github/workflows/QtApng.yml index e001317..7440750 100644 --- a/.github/workflows/QtApng.yml +++ b/.github/workflows/QtApng.yml @@ -23,6 +23,13 @@ jobs: - os: macos-latest vers: '6.2.2' forceWin32: 'false' + - os: windows-2019 + vers: '6.5.0' + forceWin32: 'false' + arch: 'win64_msvc2019_64' + - os: macos-latest + vers: '6.5.0' + forceWin32: 'false' steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/kimageformats.yml b/.github/workflows/kimageformats.yml index dd241f6..62e69e4 100644 --- a/.github/workflows/kimageformats.yml +++ b/.github/workflows/kimageformats.yml @@ -25,6 +25,13 @@ jobs: - os: macos-latest vers: '6.2.2' universalBinary: 'true' + - os: windows-2019 + vers: '6.5.0' + forceWin32: 'false' + arch: 'win64_msvc2019_64' + - os: macos-latest + vers: '6.5.0' + universalBinary: 'true' steps: - uses: actions/checkout@v2 From d6b8fc3d904d32c52fd13f48b5269b690e9b5caa Mon Sep 17 00:00:00 2001 From: Nerixyz Date: Sat, 7 Oct 2023 21:43:21 +0200 Subject: [PATCH 2/6] ci: run build on PR --- .github/workflows/kimageformats.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/kimageformats.yml b/.github/workflows/kimageformats.yml index 62e69e4..21bad24 100644 --- a/.github/workflows/kimageformats.yml +++ b/.github/workflows/kimageformats.yml @@ -3,6 +3,8 @@ on: push: branches: [ master ] workflow_dispatch: + pull_request: + branches: [ master ] jobs: build: From 966ecfde801b4a39824d1ffe11223bb7c6dbf968 Mon Sep 17 00:00:00 2001 From: Nerixyz Date: Sun, 8 Oct 2023 11:44:44 +0200 Subject: [PATCH 3/6] fix: only upload when not making a PR --- .github/workflows/kimageformats.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/kimageformats.yml b/.github/workflows/kimageformats.yml index 21bad24..13cd0cd 100644 --- a/.github/workflows/kimageformats.yml +++ b/.github/workflows/kimageformats.yml @@ -65,6 +65,7 @@ jobs: filename: "kimageformats-${{ matrix.os }}-${{ matrix.vers }}${{ matrix.arch && format('-{0}', matrix.arch) || '' }}.zip" - name: 'Upload to continous release' + if: github.event_name != 'pull_request' uses: softprops/action-gh-release@v1 with: tag_name: 'cont' From 0a186c6e6447651b64566328c2663247c54f91e6 Mon Sep 17 00:00:00 2001 From: Nerixyz Date: Sun, 8 Oct 2023 11:45:23 +0200 Subject: [PATCH 4/6] ci: run QtApng workflow on PR as well --- .github/workflows/QtApng.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/QtApng.yml b/.github/workflows/QtApng.yml index 7440750..c7104ac 100644 --- a/.github/workflows/QtApng.yml +++ b/.github/workflows/QtApng.yml @@ -3,6 +3,8 @@ on: push: branches: [ master ] workflow_dispatch: + pull_request: + branches: [ master ] jobs: build: @@ -53,6 +55,7 @@ jobs: filename: "qtapng-${{ matrix.os }}-${{ matrix.vers }}${{ matrix.arch && format('-{0}', matrix.arch) || '' }}.zip" - name: 'Upload to continous release' + if: github.event_name != 'pull_request' uses: softprops/action-gh-release@v1 with: tag_name: 'cont' From 4266795caca74c79dae8bff366c840185a81f1ca Mon Sep 17 00:00:00 2001 From: Nerixyz Date: Sun, 8 Oct 2023 13:43:19 +0200 Subject: [PATCH 5/6] fix: use older Qt version --- .github/workflows/QtApng.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/QtApng.yml b/.github/workflows/QtApng.yml index c7104ac..0dd3c17 100644 --- a/.github/workflows/QtApng.yml +++ b/.github/workflows/QtApng.yml @@ -26,11 +26,11 @@ jobs: vers: '6.2.2' forceWin32: 'false' - os: windows-2019 - vers: '6.5.0' + vers: '6.4.3' forceWin32: 'false' arch: 'win64_msvc2019_64' - os: macos-latest - vers: '6.5.0' + vers: '6.4.3' forceWin32: 'false' steps: From 00f1e42109f8df769cfd1b1192e02a019dc9d007 Mon Sep 17 00:00:00 2001 From: Nerixyz Date: Fri, 20 Oct 2023 18:11:10 +0200 Subject: [PATCH 6/6] ci: build `kimageformats` on 6.4.3 --- .github/workflows/kimageformats.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/kimageformats.yml b/.github/workflows/kimageformats.yml index 13cd0cd..50ba58f 100644 --- a/.github/workflows/kimageformats.yml +++ b/.github/workflows/kimageformats.yml @@ -1,16 +1,16 @@ name: Build KImageFormats on: push: - branches: [ master ] + branches: [master] workflow_dispatch: pull_request: - branches: [ master ] + branches: [master] jobs: build: runs-on: ${{ matrix.os }} strategy: - matrix: + matrix: include: - os: ubuntu-20.04 vers: '5.15.2' @@ -28,11 +28,11 @@ jobs: vers: '6.2.2' universalBinary: 'true' - os: windows-2019 - vers: '6.5.0' + vers: '6.4.3' forceWin32: 'false' arch: 'win64_msvc2019_64' - os: macos-latest - vers: '6.5.0' + vers: '6.4.3' universalBinary: 'true' steps: @@ -69,4 +69,4 @@ jobs: uses: softprops/action-gh-release@v1 with: tag_name: 'cont' - files: kimageformats-*.zip + files: kimageformats-*.zip