Skip to content

Commit

Permalink
Bump CI Qt version from 5.12.5 to 5.12.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Bionus committed Feb 25, 2020
1 parent 303a40f commit 9c9017b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
16 changes: 8 additions & 8 deletions .appveyor.yml
Expand Up @@ -6,37 +6,37 @@ environment:
DEPLOY: 0
BREAKPAD: 0
MYSQL_VERSION: mysql-5.7.14-win32
APNG_PLUGIN: apng-1.1.2-55.12.5
APNG_PLUGIN: apng-1.1.2-65.12.6
QSCINTILLA_VERSION: QScintilla_gpl-2.10.8

matrix:
# MSVC x86
- PLATFORM: amd64_x86
QTDIR: C:\Qt\5.12.5\msvc2017
QTDIR: C:\Qt\5.12.6\msvc2017
OPENSSLDIR: C:\OpenSSL-v111-Win32
MAKE: nmake
MAKEFILES: NMake Makefiles
DEPLOY: 1

# MSVC x64
- PLATFORM: amd64
QTDIR: C:\Qt\5.12.5\msvc2017_64
QTDIR: C:\Qt\5.12.6\msvc2017_64
OPENSSLDIR: C:\OpenSSL-v111-Win64
MAKE: nmake
MAKEFILES: NMake Makefiles
DEPLOY: 1

# MinGW
- PLATFORM: mingw
QTDIR: C:\Qt\5.12.5\mingw73_32
QTDIR: C:\Qt\5.12.6\mingw73_32
OPENSSLDIR: C:\OpenSSL-v111-Win32
MAKE: mingw32-make
MAKEFILES: MinGW Makefiles

cache:
- release\sites\node_modules -> release\sites\package.json
- mysql-5.7.14-win32 -> .appveyor.yml
- apng-1.1.2-55.12.5 -> .appveyor.yml
- apng-1.1.2-65.12.6 -> .appveyor.yml
- QScintilla_gpl-2.10.8 -> .appveyor.yml
- depot_tools -> .appveyor.yml
- breakpad -> .appveyor.yml
Expand Down Expand Up @@ -82,7 +82,7 @@ build_script:
- if %DEPLOY%==1 if not exist %QSCINTILLA_VERSION% set "QSCINTILLA_BUILD=1"
- if %QSCINTILLA_BUILD%==1 curl -L "https://sourceforge.net/projects/pyqt/files/QScintilla2/QScintilla-2.10.8/%QSCINTILLA_VERSION%.zip" -o "%QSCINTILLA_VERSION%.zip"
- if %QSCINTILLA_BUILD%==1 7z x "%QSCINTILLA_VERSION%.zip" -y
- if %DEPLOY%==1 call "%QTDIR%/bin/qtenv2.bat"
- if %DEPLOY%==1 call "%QTDIR%\bin\qtenv2.bat"
- if %DEPLOY%==1 cd "%APPVEYOR_BUILD_FOLDER%/%QSCINTILLA_VERSION%/Qt4Qt5"
- if %QSCINTILLA_BUILD%==1 qmake qscintilla.pro
- if %QSCINTILLA_BUILD%==1 if not %PLATFORM%==mingw (nmake) else (mingw32-make)
Expand All @@ -98,15 +98,15 @@ build_script:
- cd ..

# Download APNG plugin DLL
- if %DEPLOY%==1 if not exist %APNG_PLUGIN% curl -L https://install.skycoder42.de/qtmodules/windows_x86/qt5125/qt.qt5.5125.skycoder42.apng.win32_msvc2017/1.1.2-55.12.5.7z -o "%APNG_PLUGIN%.7z"
- if %DEPLOY%==1 if not exist %APNG_PLUGIN% curl -L https://install.skycoder42.de/qtmodules/windows_x86/qt5126/qt.qt5.5126.skycoder42.apng.win32_msvc2017/1.1.2-65.12.6.7z -o "%APNG_PLUGIN%.7z"
- if %DEPLOY%==1 if not exist %APNG_PLUGIN% 7z x "%APNG_PLUGIN%.7z" -y -o"%APNG_PLUGIN%"

# Download Mysql DLL
- if %DEPLOY%==1 if not exist %MYSQL_VERSION% curl -L -O "https://dev.mysql.com/get/Downloads/MySQL-5.7/%MYSQL_VERSION%.zip"
- if %DEPLOY%==1 if not exist %MYSQL_VERSION% 7z x "%MYSQL_VERSION%.zip" -y

# Generate installer
- if %DEPLOY%==1 iscc /Q /DMyAppVersion="%GRABBER_VERSION%" /DPlatformName="%PLATFORM_NAME%" /DQtDir="%QTDIR%\bin" /DOpenSSLDir="%OPENSSLDIR%" /DMySQLDir="%APPVEYOR_BUILD_FOLDER%\%MYSQL_VERSION%" /DQtApngDll="%APPVEYOR_BUILD_FOLDER%\%APNG_PLUGIN%\5.12.5\msvc2017\plugins\imageformats\qapng.dll" releases/setup.iss
- if %DEPLOY%==1 iscc /Q /DMyAppVersion="%GRABBER_VERSION%" /DPlatformName="%PLATFORM_NAME%" /DQtDir="%QTDIR%\bin" /DOpenSSLDir="%OPENSSLDIR%" /DMySQLDir="%APPVEYOR_BUILD_FOLDER%\%MYSQL_VERSION%" /DQtApngDll="%APPVEYOR_BUILD_FOLDER%\%APNG_PLUGIN%\5.12.6\msvc2017\plugins\imageformats\qapng.dll" releases/setup.iss

# Package symbol files to zip
- if %DEPLOY%==1 if "%BUILD_TYPE%"=="RelWithDebInfo" 7z a "releases\Grabber_%GRABBER_VERSION%_%PLATFORM_NAME%_symbols.zip" ".\build\gui\Grabber.pdb" ".\build\cli\Grabber-cli.pdb"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Expand Up @@ -24,7 +24,7 @@ jobs:
echo ::set-env name=PLATFORM_NAME::x64
echo ::set-env name=OPENSSL_ROOT_DIR::%GITHUB_WORKSPACE%\vendor\OpenSSL
echo ::set-env name=MYSQL_INSTALL_DIR::%GITHUB_WORKSPACE%\vendor\%MYSQL_VERSION%
echo ::set-env name=APNG_PLUGIN_DLL::%GITHUB_WORKSPACE%\vendor\APNG\5.12.5\msvc2017\plugins\imageformats\qapng.dll
echo ::set-env name=APNG_PLUGIN_DLL::%GITHUB_WORKSPACE%\vendor\APNG\5.12.6\msvc2017\plugins\imageformats\qapng.dll
- name: Vendor cache
uses: actions/cache@v1
Expand All @@ -42,7 +42,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v2.1.0
with:
version: 5.12.5
version: 5.12.6

- name: Install QScintilla
working-directory: vendor_qt
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
working-directory: vendor
shell: cmd
run: |
curl -Lo APNG.7z https://install.skycoder42.de/qtmodules/windows_x86/qt5125/qt.qt5.5125.skycoder42.apng.win32_msvc2017/1.1.2-55.12.5.7z
curl -Lo APNG.7z https://install.skycoder42.de/qtmodules/windows_x86/qt5126/qt.qt5.5126.skycoder42.apng.win32_msvc2017/1.1.2-65.12.6.7z
7z x APNG.7z -y -oAPNG
rm APNG.7z
Expand Down

0 comments on commit 9c9017b

Please sign in to comment.