diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-05-27 12:20:05 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-06-02 09:35:00 +0000 |
| commit | b0f51e317a066e8cf3c74813594ada628b1f2412 (patch) | |
| tree | 983fec935d30571705709627407e89ec5d084ef5 | |
| parent | 2d5a4464bec9662bbeb9e87c2c3b94f7ef599cf4 (diff) | |
Update GitHub actions for 4.13.0-beta1
Change-Id: I6d3c05c246db5be671e3fd8630652ced5ef792f4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | .github/workflows/build_qmake.yml | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/.github/workflows/build_qmake.yml b/.github/workflows/build_qmake.yml index bdba205..fcd9e48 100644 --- a/.github/workflows/build_qmake.yml +++ b/.github/workflows/build_qmake.yml @@ -3,9 +3,9 @@ name: QMake Build Matrix on: [push] env: - QT_VERSION: 5.14.1 - QT_CREATOR_VERSION: 4.12.0 - QT_CREATOR_SNAPSHOT: NO + QT_VERSION: 5.14.2 + QT_CREATOR_VERSION: 4.13.0-beta1 + QT_CREATOR_SNAPSHOT: latest PLUGIN_PRO: haskell.pro PLUGIN_NAME: Haskell @@ -46,6 +46,12 @@ jobs: COMMAND sudo apt install libgl1-mesa-dev ) endif() + if ("${{ runner.os }}" STREQUAL "Windows") + # get JOM + file(DOWNLOAD "https://download.qt.io/official_releases/jom/jom.zip" ./jom.zip SHOW_PROGRESS) + file(MAKE_DIRECTORY ./jom) + execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf ../jom.zip WORKING_DIRECTORY ./jom) + endif() - name: Download Qt id: qt @@ -126,14 +132,14 @@ jobs: set(qtc_output_directory "qtcreator/lib/qtcreator/plugins") set(qtc_binary_name "$ENV{PLUGIN_NAME}4.dll") if ("${{ matrix.config.environment_script }}" MATCHES "vcvars64.bat") - set(qtc_platform "windows_msvc2017_x64") + set(qtc_platform "windows_x64") elseif ("${{ matrix.config.environment_script }}" MATCHES "vcvars32.bat") - set(qtc_platform "windows_msvc2017_x86") + set(qtc_platform "windows_x86") endif() elseif ("${{ runner.os }}" STREQUAL "Linux") set(qtc_output_directory "qtcreator/lib/qtcreator/plugins") set(qtc_binary_name "lib$ENV{PLUGIN_NAME}.so") - set(qtc_platform "linux_gcc_64_rhel72") + set(qtc_platform "linux_x64") elseif ("${{ runner.os }}" STREQUAL "macOS") set(qtc_output_directory "qtcreator/bin/Qt Creator.app/Contents/PlugIns") set(qtc_binary_name "lib$ENV{PLUGIN_NAME}.dylib") @@ -210,7 +216,7 @@ jobs: set(make_program make -j ${N}) if ("${{ runner.os }}" STREQUAL "Windows") - set(make_program "qtcreator/bin/jom") + set(make_program "jom/jom") endif() execute_process( |