diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 21e486f17..3d259f333 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -57,9 +57,9 @@ jobs: PREFIX: "/usr/local/macos" MACOSX_DEPLOYMENT_TARGET: "10.12" XZ: "xz-5.2.4" - QT: "5_15_1" + QT: "5_15_2" OPENSSL_VER: "1_1_1" - QT_PREFIX: "/usr/local/desktop-app/Qt-5.15.1" + QT_PREFIX: "/usr/local/desktop-app/Qt-5.15.2" LIBICONV_VER: "libiconv-1.16" UPLOAD_ARTIFACT: "false" ONLY_CACHE: "false" @@ -419,20 +419,20 @@ jobs: build/gyp_crashpad.py -Dmac_deployment_target=10.10 ninja -C out/Debug - - name: Qt 5.15.1 cache. + - name: Qt 5.15.2 cache. id: cache-qt uses: actions/cache@v2 with: path: ${{ env.LibrariesPath }}/qt-cache - key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_15_1/*') }} - - name: Use cached Qt 5.15.1. + key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_15_2/*') }} + - name: Use cached Qt 5.15.2. if: steps.cache-qt.outputs.cache-hit == 'true' run: | cd $LibrariesPath - mv qt-cache Qt-5.15.1 + mv qt-cache Qt-5.15.2 sudo mkdir -p $QT_PREFIX - sudo mv -f Qt-5.15.1 "$(dirname "$QT_PREFIX")"/ - - name: Qt 5.15.1 build. + sudo mv -f Qt-5.15.2 "$(dirname "$QT_PREFIX")"/ + - name: Qt 5.15.2 build. if: steps.cache-qt.outputs.cache-hit != 'true' run: | cd $LibrariesPath @@ -440,7 +440,7 @@ jobs: git clone git://code.qt.io/qt/qt5.git qt_$QT cd qt_$QT perl init-repository --module-subset=qtbase,qtimageformats - git checkout v5.15.1 + git checkout v5.15.2 git submodule update qtbase git submodule update qtimageformats cd qtbase diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml index 0f7e70d91..81b65aa12 100644 --- a/.github/workflows/win.yml +++ b/.github/workflows/win.yml @@ -59,8 +59,8 @@ jobs: SDK: "10.0.18362.0" VC: "call vcvars32.bat && cd Libraries" GIT: "https://github.com" - QT: "5_15_1" - QT_VER: "5.15.1" + QT: "5_15_2" + QT_VER: "5.15.2" OPENSSL_VER: "1_1_1" UPLOAD_ARTIFACT: "false" ONLY_CACHE: "false" @@ -211,7 +211,7 @@ jobs: run: | %VC% - git clone -b openal-soft-1.21.0 --depth=1 $GIT/kcat/openal-soft.git + git clone -b openal-soft-1.21.0 --depth=1 %GIT%/kcat/openal-soft.git cd openal-soft\build cmake .. ^ -G "Visual Studio 16 2019" ^ @@ -299,13 +299,13 @@ jobs: rmdir /S /Q .git - - name: Qt 5.15.1 cache. + - name: Qt 5.15.2 cache. id: cache-qt uses: actions/cache@v2 with: path: ${{ env.LibrariesPath }}/Qt-${{ env.QT_VER }} - key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_15_1/*') }} - - name: Configure Qt 5.15.1. + key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_15_2/*') }} + - name: Configure Qt 5.15.2. if: steps.cache-qt.outputs.cache-hit != 'true' run: | %VC% @@ -342,7 +342,7 @@ jobs: -I "%LibrariesPath%\mozjpeg" ^ LIBJPEG_LIBS_DEBUG="%LibrariesPath%\mozjpeg\Debug\jpeg-static.lib" ^ LIBJPEG_LIBS_RELEASE="%LibrariesPath%\mozjpeg\Release\jpeg-static.lib" - - name: Qt 5.15.1 build. + - name: Qt 5.15.2 build. if: steps.cache-qt.outputs.cache-hit != 'true' run: | %VC%