Skip to content

Commit 45219c0

Browse files
firewavefirewave
authored
changed ccache-action GitHub action to v1.2 for most workflows (#6693)
This fixes the two minute hang in the `Post ccache` step.
1 parent f39f567 commit 45219c0

10 files changed

Lines changed: 47 additions & 23 deletions

File tree

‎.github/workflows/CI-mingw.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
mingw-w64-x86_64-ccache
4242
4343
- name: ccache
44-
uses: hendrikmuhs/ccache-action@v1.2.11
44+
uses: hendrikmuhs/ccache-action@v1.2
4545
with:
4646
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
4747

‎.github/workflows/CI-unixish-docker.yml‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ jobs:
4343
# we need to stay at v3 for now because Node 20 does not support the older distros
4444
# /__e/node20/bin/node: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found (required by /__e/node20/bin/node)
4545
- uses: actions/checkout@v3
46+
if: matrix.image == 'ubuntu:16.04' || matrix.image == 'ubuntu:18.04'
47+
48+
- uses: actions/checkout@v4
49+
if: matrix.image != 'ubuntu:16.04' && matrix.image != 'ubuntu:18.04'
4650

4751
- name: Install missing software on ubuntu
4852
if: contains(matrix.image, 'ubuntu')
@@ -57,11 +61,20 @@ jobs:
5761
5862
# needs to be called after the package installation since
5963
# - it doesn't call "apt-get update"
60-
# - it doesn't support centos
6164
#
62-
# needs to be to fixated on 1.2.11 so it works with older images - see https://github.com/hendrikmuhs/ccache-action/issues/178
65+
# needs to be to fixated on 1.2.11 so it works with older images - see https://github.com/hendrikmuhs/ccache-action/issues/178.
66+
# using the older version will cause a two minute hang in its post-run step.
6367
- name: ccache
6468
uses: hendrikmuhs/ccache-action@v1.2.11
69+
if: matrix.image == 'ubuntu:16.04' || matrix.image == 'ubuntu:18.04'
70+
with:
71+
key: ${{ github.workflow }}-${{ matrix.image }}
72+
73+
# needs to be called after the package installation since
74+
# - it doesn't call "apt-get update"
75+
- name: ccache
76+
uses: hendrikmuhs/ccache-action@v1.2
77+
if: matrix.image != 'ubuntu:16.04' && matrix.image != 'ubuntu:18.04'
6578
with:
6679
key: ${{ github.workflow }}-${{ matrix.image }}
6780

@@ -109,6 +122,10 @@ jobs:
109122
# we need to stay at v3 for now because Node 20 does not support the older distros
110123
# /__e/node20/bin/node: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found (required by /__e/node20/bin/node)
111124
- uses: actions/checkout@v3
125+
if: matrix.image == 'ubuntu:16.04' || matrix.image == 'ubuntu:18.04'
126+
127+
- uses: actions/checkout@v4
128+
if: matrix.image != 'ubuntu:16.04' && matrix.image != 'ubuntu:18.04'
112129

113130
- name: Install missing software on ubuntu
114131
if: contains(matrix.image, 'ubuntu')
@@ -118,24 +135,31 @@ jobs:
118135
119136
# needs to be called after the package installation since
120137
# - it doesn't call "apt-get update"
121-
# - it doesn't support centos
122138
#
123-
# needs to be to fixated on 1.2.11 so it works with older images - see https://github.com/hendrikmuhs/ccache-action/issues/178
139+
# needs to be to fixated on 1.2.11 so it works with older images - see https://github.com/hendrikmuhs/ccache-action/issues/178.
140+
# using the older version will cause a two minute hang in its post-run step.
124141
- name: ccache
125142
uses: hendrikmuhs/ccache-action@v1.2.11
143+
if: matrix.image == 'ubuntu:16.04' || matrix.image == 'ubuntu:18.04'
144+
with:
145+
key: ${{ github.workflow }}-${{ matrix.image }}
146+
147+
# needs to be called after the package installation since
148+
# - it doesn't call "apt-get update"
149+
- name: ccache
150+
uses: hendrikmuhs/ccache-action@v1.2
151+
if: matrix.image != 'ubuntu:16.04' && matrix.image != 'ubuntu:18.04'
126152
with:
127153
key: ${{ github.workflow }}-${{ matrix.image }}
128154

129155
- name: Build cppcheck
130156
run: |
131-
# "/usr/lib64" for centos / "/usr/lib" for ubuntu
132-
export PATH="/usr/lib64/ccache:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
157+
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
133158
make -j$(nproc) HAVE_RULES=yes CXXFLAGS="-w"
134159
135160
- name: Build test
136161
run: |
137-
# "/usr/lib64" for centos / "/usr/lib" for ubuntu
138-
export PATH="/usr/lib64/ccache:/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
162+
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
139163
make -j$(nproc) testrunner HAVE_RULES=yes CXXFLAGS="-w"
140164
141165
- name: Run test

‎.github/workflows/CI-unixish.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- uses: actions/checkout@v4
3737

3838
- name: ccache
39-
uses: hendrikmuhs/ccache-action@v1.2.11
39+
uses: hendrikmuhs/ccache-action@v1.2
4040
with:
4141
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
4242

@@ -98,7 +98,7 @@ jobs:
9898
- uses: actions/checkout@v4
9999

100100
- name: ccache
101-
uses: hendrikmuhs/ccache-action@v1.2.11
101+
uses: hendrikmuhs/ccache-action@v1.2
102102
with:
103103
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
104104

@@ -171,7 +171,7 @@ jobs:
171171
- uses: actions/checkout@v4
172172

173173
- name: ccache
174-
uses: hendrikmuhs/ccache-action@v1.2.11
174+
uses: hendrikmuhs/ccache-action@v1.2
175175
with:
176176
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
177177

@@ -203,7 +203,7 @@ jobs:
203203
- uses: actions/checkout@v4
204204

205205
- name: ccache
206-
uses: hendrikmuhs/ccache-action@v1.2.11
206+
uses: hendrikmuhs/ccache-action@v1.2
207207
with:
208208
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
209209

@@ -272,7 +272,7 @@ jobs:
272272
brew link qt@5 --force
273273
274274
- name: ccache
275-
uses: hendrikmuhs/ccache-action@v1.2.11
275+
uses: hendrikmuhs/ccache-action@v1.2
276276
with:
277277
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
278278

@@ -345,7 +345,7 @@ jobs:
345345
- uses: actions/checkout@v4
346346

347347
- name: ccache
348-
uses: hendrikmuhs/ccache-action@v1.2.11
348+
uses: hendrikmuhs/ccache-action@v1.2
349349
with:
350350
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
351351

@@ -505,7 +505,7 @@ jobs:
505505
- uses: actions/checkout@v4
506506

507507
- name: ccache
508-
uses: hendrikmuhs/ccache-action@v1.2.11
508+
uses: hendrikmuhs/ccache-action@v1.2
509509
with:
510510
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
511511

‎.github/workflows/asan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- uses: actions/checkout@v4
3030

3131
- name: ccache
32-
uses: hendrikmuhs/ccache-action@v1.2.11
32+
uses: hendrikmuhs/ccache-action@v1.2
3333
with:
3434
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
3535

‎.github/workflows/coverage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/checkout@v4
2626

2727
- name: ccache
28-
uses: hendrikmuhs/ccache-action@v1.2.11
28+
uses: hendrikmuhs/ccache-action@v1.2
2929
with:
3030
key: ${{ github.workflow }}-${{ runner.os }}
3131

‎.github/workflows/scriptcheck.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: actions/checkout@v4
2525

2626
- name: ccache
27-
uses: hendrikmuhs/ccache-action@v1.2.11
27+
uses: hendrikmuhs/ccache-action@v1.2
2828
with:
2929
key: ${{ github.workflow }}-${{ runner.os }}
3030

‎.github/workflows/selfcheck.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
sudo apt-get install libboost-container-dev
3232
3333
- name: ccache
34-
uses: hendrikmuhs/ccache-action@v1.2.11
34+
uses: hendrikmuhs/ccache-action@v1.2
3535
with:
3636
key: ${{ github.workflow }}-${{ runner.os }}
3737

‎.github/workflows/tsan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- uses: actions/checkout@v4
3030

3131
- name: ccache
32-
uses: hendrikmuhs/ccache-action@v1.2.11
32+
uses: hendrikmuhs/ccache-action@v1.2
3333
with:
3434
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
3535

‎.github/workflows/ubsan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- uses: actions/checkout@v4
3030

3131
- name: ccache
32-
uses: hendrikmuhs/ccache-action@v1.2.11
32+
uses: hendrikmuhs/ccache-action@v1.2
3333
with:
3434
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
3535

‎.github/workflows/valgrind.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@v4
2424

2525
- name: ccache
26-
uses: hendrikmuhs/ccache-action@v1.2.11
26+
uses: hendrikmuhs/ccache-action@v1.2
2727
with:
2828
key: ${{ github.workflow }}-${{ runner.os }}
2929

0 commit comments

Comments
 (0)