mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-01 07:05:13 +00:00
Code Issues Releases Wiki Activity

Updated Qt version in GitHub Actions workflows

Browse Source
This commit is contained in:
zurg3
2020-11-06 19:10:14 +03:00
committed by John Preston
parent 8a9317f9e1
commit a68d9b4522
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/linux.yml vendored
View File

@@ -58,8 +58,8 @@ jobs:
env: env:
GIT: "https://github.com" GIT: "https://github.com"
QT: "5_12_8" QT: "5_15_1"
QT_PREFIX: "/usr/local/desktop-app/Qt-5.12.8" QT_PREFIX: "/usr/local/desktop-app/Qt-5.15.1"
OPENSSL_VER: "1_1_1" OPENSSL_VER: "1_1_1"
OPENSSL_PREFIX: "/usr/local/desktop-app/openssl-1.1.1" OPENSSL_PREFIX: "/usr/local/desktop-app/openssl-1.1.1"
CMAKE_VER: "3.17.0" CMAKE_VER: "3.17.0"
@@ -427,18 +427,18 @@ jobs:
cd .. cd ..
rm -rf libxkbcommon rm -rf libxkbcommon
- name: Qt 5.12.8 cache. - name: Qt 5.15.1 cache.
id: cache-qt id: cache-qt
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ${{ env.LibrariesPath }}/qt-cache path: ${{ env.LibrariesPath }}/qt-cache
key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qt*_5_12_8/*') }} key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qt*_5_15_1/*') }}
- name: Qt 5.12.8 build. - name: Qt 5.15.1 build.
if: steps.cache-qt.outputs.cache-hit != 'true' if: steps.cache-qt.outputs.cache-hit != 'true'
run: | run: |
cd $LibrariesPath cd $LibrariesPath
git clone -b v5.12.8 --depth=1 git://code.qt.io/qt/qt5.git qt_${QT} git clone -b v5.15.1 --depth=1 git://code.qt.io/qt/qt5.git qt_${QT}
cd qt_${QT} cd qt_${QT}
perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg
git submodule update qtbase qtwayland qtimageformats qtsvg git submodule update qtbase qtwayland qtimageformats qtsvg
@@ -471,7 +471,7 @@ jobs:
sudo make INSTALL_ROOT="$LibrariesPath/qt-cache" install sudo make INSTALL_ROOT="$LibrariesPath/qt-cache" install
cd .. cd ..
rm -rf qt_${QT} rm -rf qt_${QT}
- name: Qt 5.12.8 install. - name: Qt 5.15.1 install.
run: | run: |
cd $LibrariesPath cd $LibrariesPath
sudo cp -R qt-cache/. / sudo cp -R qt-cache/. /

18
.github/workflows/mac.yml vendored
View File

@@ -57,9 +57,9 @@ jobs:
PREFIX: "/usr/local/macos" PREFIX: "/usr/local/macos"
MACOSX_DEPLOYMENT_TARGET: "10.12" MACOSX_DEPLOYMENT_TARGET: "10.12"
XZ: "xz-5.2.4" XZ: "xz-5.2.4"
QT: "5_12_8" QT: "5_15_1"
OPENSSL_VER: "1_1_1" OPENSSL_VER: "1_1_1"
QT_PREFIX: "/usr/local/desktop-app/Qt-5.12.8" QT_PREFIX: "/usr/local/desktop-app/Qt-5.15.1"
LIBICONV_VER: "libiconv-1.16" LIBICONV_VER: "libiconv-1.16"
UPLOAD_ARTIFACT: "false" UPLOAD_ARTIFACT: "false"
ONLY_CACHE: "false" ONLY_CACHE: "false"
@@ -417,20 +417,20 @@ jobs:
build/gyp_crashpad.py -Dmac_deployment_target=10.10 build/gyp_crashpad.py -Dmac_deployment_target=10.10
ninja -C out/Debug ninja -C out/Debug
- name: Qt 5.12.8 cache. - name: Qt 5.15.1 cache.
id: cache-qt id: cache-qt
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ${{ env.LibrariesPath }}/qt-cache path: ${{ env.LibrariesPath }}/qt-cache
key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_12_8/*') }} key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_15_1/*') }}
- name: Use cached Qt 5.12.8. - name: Use cached Qt 5.15.1.
if: steps.cache-qt.outputs.cache-hit == 'true' if: steps.cache-qt.outputs.cache-hit == 'true'
run: | run: |
cd $LibrariesPath cd $LibrariesPath
mv qt-cache Qt-5.12.8 mv qt-cache Qt-5.15.1
sudo mkdir -p $QT_PREFIX sudo mkdir -p $QT_PREFIX
sudo mv -f Qt-5.12.8 "$(dirname "$QT_PREFIX")"/ sudo mv -f Qt-5.15.1 "$(dirname "$QT_PREFIX")"/
- name: Qt 5.12.8 build. - name: Qt 5.15.1 build.
if: steps.cache-qt.outputs.cache-hit != 'true' if: steps.cache-qt.outputs.cache-hit != 'true'
run: | run: |
cd $LibrariesPath cd $LibrariesPath
@@ -438,7 +438,7 @@ jobs:
git clone git://code.qt.io/qt/qt5.git qt_$QT git clone git://code.qt.io/qt/qt5.git qt_$QT
cd qt_$QT cd qt_$QT
perl init-repository --module-subset=qtbase,qtimageformats perl init-repository --module-subset=qtbase,qtimageformats
git checkout v5.12.8 git checkout v5.15.1
git submodule update qtbase git submodule update qtbase
git submodule update qtimageformats git submodule update qtimageformats
cd qtbase cd qtbase

12
.github/workflows/win.yml vendored
View File

@@ -59,8 +59,8 @@ jobs:
SDK: "10.0.18362.0" SDK: "10.0.18362.0"
VC: "call vcvars32.bat && cd Libraries" VC: "call vcvars32.bat && cd Libraries"
GIT: "https://github.com" GIT: "https://github.com"
QT: "5_12_8" QT: "5_15_1"
QT_VER: "5.12.8" QT_VER: "5.15.1"
OPENSSL_VER: "1_1_1" OPENSSL_VER: "1_1_1"
UPLOAD_ARTIFACT: "false" UPLOAD_ARTIFACT: "false"
ONLY_CACHE: "false" ONLY_CACHE: "false"
@@ -301,13 +301,13 @@ jobs:
rmdir /S /Q .git rmdir /S /Q .git
- name: Qt 5.12.8 cache. - name: Qt 5.15.1 cache.
id: cache-qt id: cache-qt
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ${{ env.LibrariesPath }}/Qt-${{ env.QT_VER }} path: ${{ env.LibrariesPath }}/Qt-${{ env.QT_VER }}
key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_12_8/*') }} key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_15_1/*') }}
- name: Configure Qt 5.12.8. - name: Configure Qt 5.15.1.
if: steps.cache-qt.outputs.cache-hit != 'true' if: steps.cache-qt.outputs.cache-hit != 'true'
run: | run: |
%VC% %VC%
@@ -344,7 +344,7 @@ jobs:
-I "%LibrariesPath%\mozjpeg" ^ -I "%LibrariesPath%\mozjpeg" ^
LIBJPEG_LIBS_DEBUG="%LibrariesPath%\mozjpeg\Debug\jpeg-static.lib" ^ LIBJPEG_LIBS_DEBUG="%LibrariesPath%\mozjpeg\Debug\jpeg-static.lib" ^
LIBJPEG_LIBS_RELEASE="%LibrariesPath%\mozjpeg\Release\jpeg-static.lib" LIBJPEG_LIBS_RELEASE="%LibrariesPath%\mozjpeg\Release\jpeg-static.lib"
- name: Qt 5.12.8 build. - name: Qt 5.15.1 build.
if: steps.cache-qt.outputs.cache-hit != 'true' if: steps.cache-qt.outputs.cache-hit != 'true'
run: | run: |
%VC% %VC%