diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index ce86104a..c4bbab05 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -3,7 +3,7 @@ name: pr-check on: [pull_request] env: - QT_VERSION: '6.6.3' + QT_VERSION: '6.8.0' jobs: Linux: @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: version: ${{env.QT_VERSION}} cache: true @@ -26,14 +26,14 @@ jobs: make -j5 Flatpak: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest container: - image: docker.io/bilelmoussaoui/flatpak-github-actions:kde-6.6 + image: docker.io/bilelmoussaoui/flatpak-github-actions:kde-6.7 options: --privileged steps: - uses: actions/checkout@v4 - - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4 + - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6 with: bundle: "org.fedoraproject.MediaWriter.flatpak" manifest-path: "dist/flatpak/org.fedoraproject.MediaWriter.json" @@ -51,7 +51,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: version: ${{env.QT_VERSION}} modules: qtimageformats @@ -85,7 +85,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: version: ${{env.QT_VERSION}} modules: qtimageformats @@ -114,7 +114,7 @@ jobs: path: FedoraMediaWriter-osx-arm64.dmg Windows-MSVC: - runs-on: windows-2019 + runs-on: windows-2022 steps: - uses: actions/checkout@v4 @@ -125,10 +125,10 @@ jobs: choco install dos2unix - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: version: ${{env.QT_VERSION}} - arch: win64_msvc2019_64 + arch: win64_msvc2022_64 cache: true cache-key-prefix: ${{ github.job }}-qt @@ -139,7 +139,7 @@ jobs: shell: bash if: ${{ !steps.cache-qt.outputs.cache-hit }} run: | - eval "$(./dist/win/make-vs2019-env.bat)" + eval "$(./dist/win/make-vs2022-env.bat)" git clone https://git.tukaani.org/xz.git cd xz git checkout v5.4.5 @@ -155,7 +155,7 @@ jobs: - name: Build MediaWriter shell: bash run: | - eval "$(./dist/win/make-vs2019-env.bat)" + eval "$(./dist/win/make-vs2022-env.bat)" mkdir build cd build cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$Qt6_DIR" .. diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ce6d4045..5404a9a8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,7 +5,7 @@ on: types: [ created ] env: - QT_VERSION: '6.6.3' + QT_VERSION: '6.8.0' jobs: macOS: @@ -17,7 +17,7 @@ jobs: run: echo "TAG_NAME=$(bash ./dist/get-tag-name.sh)" >> $GITHUB_ENV - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: version: ${{env.QT_VERSION}} modules: qtimageformats @@ -53,7 +53,7 @@ jobs: run: echo "TAG_NAME=$(bash ./dist/get-tag-name.sh)" >> $GITHUB_ENV - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: version: ${{env.QT_VERSION}} modules: qtimageformats @@ -81,7 +81,7 @@ jobs: bash dist/upload-to-github.sh github_api_token=${{ secrets.GITHUB_TOKEN }} tag="${{ env.TAG_NAME }}" filename="FedoraMediaWriter-osx-arm64-${{ env.TAG_NAME }}.dmg" Windows-MSVC: - runs-on: windows-2019 + runs-on: windows-2022 steps: - uses: actions/checkout@v4 @@ -95,10 +95,10 @@ jobs: choco install dos2unix - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: version: ${{env.QT_VERSION}} - arch: win64_msvc2019_64 + arch: win64_msvc2022_64 cache: true cache-key-prefix: ${{ github.job }}-qt @@ -109,7 +109,7 @@ jobs: shell: bash if: ${{ !steps.cache-qt.outputs.cache-hit }} run: | - eval "$(./dist/win/make-vs2019-env.bat)" + eval "$(./dist/win/make-vs2022-env.bat)" git clone https://git.tukaani.org/xz.git cd xz git checkout v5.4.5 @@ -125,7 +125,7 @@ jobs: - name: Build MediaWriter shell: bash run: | - eval "$(./dist/win/make-vs2019-env.bat)" + eval "$(./dist/win/make-vs2022-env.bat)" mkdir build cd build cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$Qt6_DIR" .. diff --git a/dist/win/make-vs2019-env-attribution b/dist/win/make-vs2022-env-attribution similarity index 100% rename from dist/win/make-vs2019-env-attribution rename to dist/win/make-vs2022-env-attribution diff --git a/dist/win/make-vs2019-env.bat b/dist/win/make-vs2022-env.bat similarity index 83% rename from dist/win/make-vs2019-env.bat rename to dist/win/make-vs2022-env.bat index 204c871d..74372b82 100644 --- a/dist/win/make-vs2019-env.bat +++ b/dist/win/make-vs2022-env.bat @@ -2,7 +2,7 @@ set OLDPATH=%PATH% -call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 > NUL: +call "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 > NUL: echo export INCLUDE='%INCLUDE%' echo export LIB='%LIB%'