cache remaining Qt installations in CI (#3782)
This commit is contained in:
parent
d6ae089ca5
commit
d928b57829
|
@ -12,6 +12,9 @@ jobs:
|
||||||
container:
|
container:
|
||||||
image: "ubuntu:21.10"
|
image: "ubuntu:21.10"
|
||||||
|
|
||||||
|
env:
|
||||||
|
QT_VERSION: 5.15.2
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|
||||||
|
@ -19,20 +22,25 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
apt-get update
|
apt-get update
|
||||||
apt-get install -y cmake g++ make
|
apt-get install -y cmake g++ make
|
||||||
apt-get install -y z3 libz3-dev
|
apt-get install -y libz3-dev
|
||||||
apt-get install -y libpcre3-dev
|
apt-get install -y libpcre3-dev
|
||||||
apt-get install -y libffi7 # work around missing dependency for Qt install step
|
apt-get install -y libffi7 # work around missing dependency for Qt install step
|
||||||
apt-get install -y software-properties-common
|
|
||||||
add-apt-repository universe
|
|
||||||
apt-get update
|
|
||||||
apt-get install -y clang-tidy-13
|
apt-get install -y clang-tidy-13
|
||||||
|
|
||||||
- name: Install Qt
|
- name: Cache Qt ${{ env.QT_VERSION }}
|
||||||
|
id: cache-qt
|
||||||
|
uses: actions/cache@v1 # not v2!
|
||||||
|
with:
|
||||||
|
path: ../Qt
|
||||||
|
key: Linux-QtCache-${{ env.QT_VERSION }}-qtcharts
|
||||||
|
|
||||||
|
- name: Install Qt ${{ env.QT_VERSION }}
|
||||||
uses: jurplel/install-qt-action@v2
|
uses: jurplel/install-qt-action@v2
|
||||||
with:
|
with:
|
||||||
install-deps: 'nosudo'
|
install-deps: 'nosudo'
|
||||||
version: '5.15.2'
|
version: ${{ env.QT_VERSION }}
|
||||||
modules: 'qtcharts'
|
modules: 'qtcharts'
|
||||||
|
cached: ${{ steps.cache-qt.outputs.cache-hit }}
|
||||||
|
|
||||||
- name: Prepare CMake
|
- name: Prepare CMake
|
||||||
run: |
|
run: |
|
||||||
|
|
|
@ -9,19 +9,30 @@ jobs:
|
||||||
|
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
|
|
||||||
|
env:
|
||||||
|
QT_VERSION: 5.15.2
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Install missing software
|
- name: Install missing software
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install z3 libz3-dev
|
sudo apt-get install libz3-dev
|
||||||
|
|
||||||
- name: Install Qt
|
- name: Cache Qt ${{ env.QT_VERSION }}
|
||||||
|
id: cache-qt
|
||||||
|
uses: actions/cache@v1 # not v2!
|
||||||
|
with:
|
||||||
|
path: ../Qt
|
||||||
|
key: Linux-QtCache-${{ env.QT_VERSION }}-qtcharts
|
||||||
|
|
||||||
|
- name: Install Qt ${{ env.QT_VERSION }}
|
||||||
uses: jurplel/install-qt-action@v2
|
uses: jurplel/install-qt-action@v2
|
||||||
with:
|
with:
|
||||||
version: '5.15.2'
|
version: ${{ env.QT_VERSION }}
|
||||||
modules: 'qtcharts'
|
modules: 'qtcharts'
|
||||||
|
cached: ${{ steps.cache-qt.outputs.cache-hit }}
|
||||||
|
|
||||||
# TODO: cache this - perform same build as for the other self check
|
# TODO: cache this - perform same build as for the other self check
|
||||||
- name: Self check (build)
|
- name: Self check (build)
|
||||||
|
|
Loading…
Reference in New Issue