Skip to content

Commit d928b57

Browse files
authored
cache remaining Qt installations in CI (#3782)
1 parent d6ae089 commit d928b57

2 files changed

Lines changed: 28 additions & 9 deletions

File tree

.github/workflows/clang-tidy.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,35 @@ jobs:
1212
container:
1313
image: "ubuntu:21.10"
1414

15+
env:
16+
QT_VERSION: 5.15.2
17+
1518
steps:
1619
- uses: actions/checkout@v2
1720

1821
- name: Install missing software
1922
run: |
2023
apt-get update
2124
apt-get install -y cmake g++ make
22-
apt-get install -y z3 libz3-dev
25+
apt-get install -y libz3-dev
2326
apt-get install -y libpcre3-dev
2427
apt-get install -y libffi7 # work around missing dependency for Qt install step
25-
apt-get install -y software-properties-common
26-
add-apt-repository universe
27-
apt-get update
2828
apt-get install -y clang-tidy-13
2929
30-
- name: Install Qt
30+
- name: Cache Qt ${{ env.QT_VERSION }}
31+
id: cache-qt
32+
uses: actions/cache@v1 # not v2!
33+
with:
34+
path: ../Qt
35+
key: Linux-QtCache-${{ env.QT_VERSION }}-qtcharts
36+
37+
- name: Install Qt ${{ env.QT_VERSION }}
3138
uses: jurplel/install-qt-action@v2
3239
with:
3340
install-deps: 'nosudo'
34-
version: '5.15.2'
41+
version: ${{ env.QT_VERSION }}
3542
modules: 'qtcharts'
43+
cached: ${{ steps.cache-qt.outputs.cache-hit }}
3644

3745
- name: Prepare CMake
3846
run: |

.github/workflows/selfcheck.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,30 @@ jobs:
99

1010
runs-on: ubuntu-20.04
1111

12+
env:
13+
QT_VERSION: 5.15.2
14+
1215
steps:
1316
- uses: actions/checkout@v2
1417

1518
- name: Install missing software
1619
run: |
1720
sudo apt-get update
18-
sudo apt-get install z3 libz3-dev
21+
sudo apt-get install libz3-dev
22+
23+
- name: Cache Qt ${{ env.QT_VERSION }}
24+
id: cache-qt
25+
uses: actions/cache@v1 # not v2!
26+
with:
27+
path: ../Qt
28+
key: Linux-QtCache-${{ env.QT_VERSION }}-qtcharts
1929

20-
- name: Install Qt
30+
- name: Install Qt ${{ env.QT_VERSION }}
2131
uses: jurplel/install-qt-action@v2
2232
with:
23-
version: '5.15.2'
33+
version: ${{ env.QT_VERSION }}
2434
modules: 'qtcharts'
35+
cached: ${{ steps.cache-qt.outputs.cache-hit }}
2536

2637
# TODO: cache this - perform same build as for the other self check
2738
- name: Self check (build)

0 commit comments

Comments
 (0)