mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Qt : Bump build version to 5.12.12 (#8544)
* Qt : Bump build version to 5.12.12 * Bump cache key
This commit is contained in:
parent
64bb5c3351
commit
4d0b94570e
17
.github/workflows/AppFwkUnitTest.yml
vendored
17
.github/workflows/AppFwkUnitTest.yml
vendored
@ -11,31 +11,36 @@ jobs:
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Cache Qt
|
||||
id: cache-qt
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: ${{ github.workspace }}/Qt/
|
||||
key: ${{ runner.os }}-QtCache
|
||||
key: ${{ runner.os }}-QtCache-5-12-12
|
||||
|
||||
- name: Install Qt
|
||||
uses: jurplel/install-qt-action@v2
|
||||
with:
|
||||
version: 5.9.9
|
||||
version: 5.12.12
|
||||
modules: qtscript
|
||||
dir: '${{ github.workspace }}/Qt/'
|
||||
dir: "${{ github.workspace }}/Qt/"
|
||||
cached: ${{ steps.cache-qt.outputs.cache-hit }}
|
||||
|
||||
- name: Install Linux dependencies
|
||||
if: "contains( matrix.os, 'ubuntu')"
|
||||
run: sudo apt-get install libxkbcommon-x11-0 libgl1-mesa-dev mesa-common-dev libglfw3-dev libglu1-mesa-dev
|
||||
|
||||
- name: Build AppFwk with Unit Tests
|
||||
uses: lukka/run-cmake@v1
|
||||
with:
|
||||
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
|
||||
cmakeListsTxtPath: '${{ github.workspace }}/Fwk/AppFwk/CMakeLists.txt'
|
||||
cmakeListsTxtPath: "${{ github.workspace }}/Fwk/AppFwk/CMakeLists.txt"
|
||||
cmakeAppendedArgs:
|
||||
buildDirectory: ${{ github.workspace }}/cmakebuild
|
||||
buildWithCMakeArgs: '--config Release'
|
||||
buildWithCMakeArgs: "--config Release"
|
||||
useVcpkgToolchainFile: false
|
||||
|
||||
- name: Run Unit Tests Windows
|
||||
if: contains( matrix.os, 'windows')
|
||||
shell: bash
|
||||
@ -43,6 +48,7 @@ jobs:
|
||||
cmakebuild/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/Release/cafPdmCore_UnitTests
|
||||
cmakebuild/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/Release/cafPdmXml_UnitTests
|
||||
cmakebuild/cafProjectDataModel/cafProjectDataModel_UnitTests/Release/cafProjectDataModel_UnitTests
|
||||
|
||||
- name: Run Unit Tests Linux
|
||||
if: "!contains( matrix.os, 'windows')"
|
||||
shell: bash
|
||||
@ -50,4 +56,3 @@ jobs:
|
||||
cmakebuild/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/cafPdmCore_UnitTests
|
||||
cmakebuild/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/cafPdmXml_UnitTests
|
||||
cmakebuild/cafProjectDataModel/cafProjectDataModel_UnitTests/cafProjectDataModel_UnitTests
|
||||
|
||||
|
42
.github/workflows/ResInsightWithCache.yml
vendored
42
.github/workflows/ResInsightWithCache.yml
vendored
@ -6,10 +6,10 @@ on:
|
||||
schedule:
|
||||
# Every day at 1am to make sure we have a build cache for the current date
|
||||
# build cache is
|
||||
- cron: '0 1 * * * '
|
||||
- cron: "0 1 * * * "
|
||||
env:
|
||||
BUILD_TYPE: Release
|
||||
BUILDCACHE_VERSION: 0.24.4
|
||||
BUILDCACHE_VERSION: 0.27.6
|
||||
BUILDCACHE_DIR: ${{ github.workspace }}/buildcache_dir
|
||||
BUILDCACHE_ACCURACY: SLOPPY
|
||||
|
||||
@ -23,48 +23,53 @@ jobs:
|
||||
- {
|
||||
name: "Windows Latest MSVC",
|
||||
os: windows-latest,
|
||||
cc: "cl", cxx: "cl",
|
||||
cc: "cl",
|
||||
cxx: "cl",
|
||||
vcpkg-response-file: vcpkg_x64-windows.txt,
|
||||
vcpkg-triplet: x64-windows,
|
||||
build-python-module: true,
|
||||
execute-unit-tests: true
|
||||
execute-unit-tests: true,
|
||||
}
|
||||
- {
|
||||
name: "Ubuntu Latest gcc",
|
||||
os: ubuntu-latest,
|
||||
cc: "gcc", cxx: "g++",
|
||||
cc: "gcc",
|
||||
cxx: "g++",
|
||||
vcpkg-response-file: vcpkg_x64-linux.txt,
|
||||
vcpkg-triplet: x64-linux,
|
||||
build-python-module: true,
|
||||
execute-unit-tests: true
|
||||
execute-unit-tests: true,
|
||||
}
|
||||
- {
|
||||
name: "Ubuntu Latest clang",
|
||||
os: ubuntu-latest,
|
||||
cc: "clang", cxx: "clang++",
|
||||
cc: "clang",
|
||||
cxx: "clang++",
|
||||
vcpkg-response-file: vcpkg_x64-linux.txt,
|
||||
vcpkg-triplet: x64-linux,
|
||||
build-python-module: true,
|
||||
execute-unit-tests: true
|
||||
execute-unit-tests: true,
|
||||
}
|
||||
- {
|
||||
name: "Mac OS",
|
||||
os: macos-latest,
|
||||
cc: "clang", cxx: "clang++",
|
||||
cc: "clang",
|
||||
cxx: "clang++",
|
||||
vcpkg-response-file: vcpkg_x64-osx.txt,
|
||||
vcpkg-triplet: x64-osx,
|
||||
build-python-module: false,
|
||||
execute-unit-tests: false
|
||||
execute-unit-tests: false,
|
||||
}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
submodules: true
|
||||
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v2
|
||||
with:
|
||||
python-version: '3.8'
|
||||
python-version: "3.8"
|
||||
- name: Display Python version
|
||||
run: python -c "import sys; print(sys.version)"
|
||||
|
||||
@ -80,7 +85,7 @@ jobs:
|
||||
shell: cmake -P {0}
|
||||
run: |
|
||||
if ("${{ runner.os }}" STREQUAL "Windows")
|
||||
set(buildcache_suffix "win-msvc.zip")
|
||||
set(buildcache_suffix "windows.zip")
|
||||
elseif ("${{ runner.os }}" STREQUAL "macOS")
|
||||
set(buildcache_suffix "macos.zip")
|
||||
elseif ("${{ runner.os }}" STREQUAL "Linux")
|
||||
@ -122,17 +127,19 @@ jobs:
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: ${{ github.workspace }}/Qt/
|
||||
key: ${{ matrix.config.os }}-QtCache-v03
|
||||
key: ${{ matrix.config.os }}-QtCache-5-12-12
|
||||
- name: Install Qt
|
||||
uses: jurplel/install-qt-action@v2
|
||||
with:
|
||||
version: 5.9.9
|
||||
version: 5.12.12
|
||||
modules: qtscript qtcharts
|
||||
dir: '${{ github.workspace }}/Qt/'
|
||||
dir: "${{ github.workspace }}/Qt/"
|
||||
cached: ${{ steps.cache-qt.outputs.cache-hit }}
|
||||
|
||||
- name: Install Linux dependencies
|
||||
if: "contains( matrix.config.os, 'ubuntu')"
|
||||
run: sudo apt-get install libxkbcommon-x11-0 libgl1-mesa-dev mesa-common-dev libglfw3-dev libglu1-mesa-dev libhdf5-dev
|
||||
|
||||
- name: Get Python executable path
|
||||
id: python-path
|
||||
run: echo "::set-output name=PYTHON_EXECUTABLE::$(python -c 'import sys; import pathlib; print (pathlib.PurePath(sys.executable).as_posix())')"
|
||||
@ -147,8 +154,9 @@ jobs:
|
||||
uses: lukka/run-vcpkg@v7
|
||||
id: runvcpkg
|
||||
with:
|
||||
vcpkgArguments: '@${{ github.workspace }}/${{ matrix.config.vcpkg-response-file }}'
|
||||
vcpkgDirectory: '${{ github.workspace }}/ThirdParty/vcpkg'
|
||||
vcpkgArguments: "@${{ github.workspace }}/${{ matrix.config.vcpkg-response-file }}"
|
||||
vcpkgDirectory:
|
||||
"${{ github.workspace }}/ThirdParty/vcpkg"
|
||||
# Ensure the cache key changes any time the content of the response file changes.
|
||||
appendedCacheKey: ${{ hashFiles(env.VCPKGRESPONSEFILE) }}-cache-key-v2
|
||||
|
||||
|
@ -4,7 +4,7 @@ on:
|
||||
workflow_dispatch:
|
||||
schedule:
|
||||
# Once every night
|
||||
- cron: '0 1 * * * '
|
||||
- cron: "0 1 * * * "
|
||||
env:
|
||||
NINJA_VERSION: 1.9.0
|
||||
BUILD_TYPE: Release
|
||||
@ -21,10 +21,11 @@ jobs:
|
||||
- {
|
||||
name: "Ubuntu 20.04",
|
||||
os: ubuntu-20.04,
|
||||
cc: "gcc", cxx: "g++",
|
||||
cc: "gcc",
|
||||
cxx: "g++",
|
||||
vcpkg-response-file: vcpkg_x64-linux.txt,
|
||||
vcpkg-triplet: x64-linux,
|
||||
cmake-toolchain: 'ThirdParty/vcpkg/scripts/buildsystems/vcpkg.cmake'
|
||||
cmake-toolchain: "ThirdParty/vcpkg/scripts/buildsystems/vcpkg.cmake",
|
||||
}
|
||||
steps:
|
||||
- name: Checkout
|
||||
@ -34,7 +35,7 @@ jobs:
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v2
|
||||
with:
|
||||
python-version: '3.8'
|
||||
python-version: "3.8"
|
||||
- name: Display Python version
|
||||
run: python -c "import sys; print(sys.version)"
|
||||
- name: Download Ninja
|
||||
@ -86,13 +87,13 @@ jobs:
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: ${{ github.workspace }}/Qt/
|
||||
key: ${{ matrix.config.os }}-QtCache-v03
|
||||
key: ${{ matrix.config.os }}-QtCache-5-12-12
|
||||
- name: Install Qt
|
||||
uses: jurplel/install-qt-action@v2
|
||||
with:
|
||||
version: 5.9.9
|
||||
version: 5.12.12
|
||||
modules: qtscript qtcharts
|
||||
dir: '${{ github.workspace }}/Qt/'
|
||||
dir: "${{ github.workspace }}/Qt/"
|
||||
cached: ${{ steps.cache-qt.outputs.cache-hit }}
|
||||
- name: Install Linux dependencies
|
||||
if: "contains( matrix.config.os, 'ubuntu')"
|
||||
@ -111,8 +112,9 @@ jobs:
|
||||
uses: lukka/run-vcpkg@v5
|
||||
id: runvcpkg
|
||||
with:
|
||||
vcpkgArguments: '@${{ github.workspace }}/${{ matrix.config.vcpkg-response-file }}'
|
||||
vcpkgDirectory: '${{ github.workspace }}/ThirdParty/vcpkg'
|
||||
vcpkgArguments: "@${{ github.workspace }}/${{ matrix.config.vcpkg-response-file }}"
|
||||
vcpkgDirectory:
|
||||
"${{ github.workspace }}/ThirdParty/vcpkg"
|
||||
# Ensure the cache key changes any time the content of the response file changes.
|
||||
appendedCacheKey: ${{ hashFiles(env.VCPKGRESPONSEFILE) }}
|
||||
|
||||
|
4
.github/workflows/centos7.yml
vendored
4
.github/workflows/centos7.yml
vendored
@ -4,7 +4,7 @@ on:
|
||||
workflow_dispatch:
|
||||
schedule:
|
||||
# Once every night
|
||||
- cron: '0 1 * * * '
|
||||
- cron: "0 1 * * * "
|
||||
jobs:
|
||||
build_on_centos7:
|
||||
runs-on: ubuntu-latest
|
||||
@ -38,7 +38,7 @@ jobs:
|
||||
source /opt/rh/devtoolset-10/enable
|
||||
git clone git://code.qt.io/qt/qtcharts.git
|
||||
cd qtcharts/
|
||||
git checkout v5.9.7
|
||||
git checkout v5.12.12
|
||||
qmake-qt5 --version
|
||||
qmake-qt5 -makefile
|
||||
make -j 4
|
||||
|
Loading…
Reference in New Issue
Block a user