void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Migrate actions to Qt 5.15.2.

Browse source
This commit is contained in:
John Preston 2020-12-09 17:26:25 +04:00
parent 092e0990e8
commit 376e43d9d5
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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_15_1" QT: "5_15_2"
OPENSSL_VER: "1_1_1" 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" LIBICONV_VER: "libiconv-1.16"
UPLOAD_ARTIFACT: "false" UPLOAD_ARTIFACT: "false"
ONLY_CACHE: "false" ONLY_CACHE: "false"
@ -419,20 +419,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.15.1 cache. - name: Qt 5.15.2 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_15_1/*') }} key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_15_2/*') }}
- name: Use cached Qt 5.15.1. - name: Use cached Qt 5.15.2.
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.15.1 mv qt-cache Qt-5.15.2
sudo mkdir -p $QT_PREFIX sudo mkdir -p $QT_PREFIX
sudo mv -f Qt-5.15.1 "$(dirname "$QT_PREFIX")"/ sudo mv -f Qt-5.15.2 "$(dirname "$QT_PREFIX")"/
- name: Qt 5.15.1 build. - name: Qt 5.15.2 build.
if: steps.cache-qt.outputs.cache-hit != 'true' if: steps.cache-qt.outputs.cache-hit != 'true'
run: | run: |
cd $LibrariesPath cd $LibrariesPath
@ -440,7 +440,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.15.1 git checkout v5.15.2
git submodule update qtbase git submodule update qtbase
git submodule update qtimageformats git submodule update qtimageformats
cd qtbase cd qtbase

14
.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_15_1" QT: "5_15_2"
QT_VER: "5.15.1" QT_VER: "5.15.2"
OPENSSL_VER: "1_1_1" OPENSSL_VER: "1_1_1"
UPLOAD_ARTIFACT: "false" UPLOAD_ARTIFACT: "false"
ONLY_CACHE: "false" ONLY_CACHE: "false"
@ -211,7 +211,7 @@ jobs:
run: | run: |
%VC% %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 cd openal-soft\build
cmake .. ^ cmake .. ^
-G "Visual Studio 16 2019" ^ -G "Visual Studio 16 2019" ^
@ -299,13 +299,13 @@ jobs:
rmdir /S /Q .git rmdir /S /Q .git
- name: Qt 5.15.1 cache. - name: Qt 5.15.2 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_15_1/*') }} key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_15_2/*') }}
- name: Configure Qt 5.15.1. - name: Configure Qt 5.15.2.
if: steps.cache-qt.outputs.cache-hit != 'true' if: steps.cache-qt.outputs.cache-hit != 'true'
run: | run: |
%VC% %VC%
@ -342,7 +342,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.15.1 build. - name: Qt 5.15.2 build.
if: steps.cache-qt.outputs.cache-hit != 'true' if: steps.cache-qt.outputs.cache-hit != 'true'
run: | run: |
%VC% %VC%