Skip to content

Commit a8ee0c7

Browse files
committed
restore previous coverage level and don't use hashes for caching
1 parent 9d35c89 commit a8ee0c7

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
id: cache-simgrid
4242
with:
4343
path: /opt/simgrid
44-
key: ${{ runner.os }}-simgrid-python-${{ hashFiles('.github/workflows/build.yml') }}
44+
key: ${{ runner.os }}-simgrid-python-v2
4545

4646
- name: Install SimGrid
4747
if: steps.cache-simgrid.outputs.cache-hit != 'true'
@@ -57,7 +57,7 @@ jobs:
5757
id: cache-fsmod
5858
with:
5959
path: /opt/fsmod
60-
key: ${{ runner.os }}-fsmod-python-${{ hashFiles('.github/workflows/build.yml') }}
60+
key: ${{ runner.os }}-fsmod-python-v2
6161

6262
- name: Install FSMod
6363
if: steps.cache-fsmod.outputs.cache-hit != 'true'
@@ -73,7 +73,7 @@ jobs:
7373
id: cache-gtest
7474
with:
7575
path: /opt/gtest
76-
key: ${{ runner.os }}-gtest-${{ hashFiles('.github/workflows/build.yml') }}
76+
key: ${{ runner.os }}-gtest-v1
7777

7878
- name: Install Google Test
7979
if: steps.cache-gtest.outputs.cache-hit != 'true'
@@ -119,8 +119,8 @@ jobs:
119119
run: |
120120
cd build
121121
lcov --keep-going --directory . --capture --output-file coverage.info
122-
lcov --remove coverage.info '*/test/*' '*/include/*' -o coverage.info
123-
gcovr -e test -e examples --sonarqube -u -o coverage.xml --exclude-throw-branches \
122+
lcov --remove coverage.info '*/test/*' -o coverage.info
123+
gcovr -e test -e examples --sonarqube -o coverage.xml --exclude-throw-branches \
124124
--gcov-ignore-parse-errors --exclude-unreachable-branches
125125
126126
- name: Upload coverage to Codecov

.github/workflows/weekly-checks.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
id: cache-simgrid
4848
with:
4949
path: /opt/simgrid
50-
key: ${{ runner.os }}-simgrid-python-${{ hashFiles('.github/workflows/weekly-checks.yml') }}
50+
key: ${{ runner.os }}-simgrid-python-v2
5151

5252
- name: Install SimGrid
5353
if: steps.cache-simgrid.outputs.cache-hit != 'true'
@@ -63,7 +63,7 @@ jobs:
6363
id: cache-fsmod
6464
with:
6565
path: /opt/fsmod
66-
key: ${{ runner.os }}-fsmod-python-${{ hashFiles('.github/workflows/weekly-checks.yml') }}
66+
key: ${{ runner.os }}-fsmod-python-v2
6767

6868
- name: Install FSMod
6969
if: steps.cache-fsmod.outputs.cache-hit != 'true'
@@ -79,7 +79,7 @@ jobs:
7979
id: cache-gtest
8080
with:
8181
path: /opt/gtest
82-
key: ${{ runner.os }}-gtest-${{ hashFiles('.github/workflows/weekly-checks.yml') }}
82+
key: ${{ runner.os }}-gtest-v1
8383

8484
- name: Install Google Test
8585
if: steps.cache-gtest.outputs.cache-hit != 'true'
@@ -154,7 +154,7 @@ jobs:
154154
id: cache-simgrid
155155
with:
156156
path: /opt/simgrid
157-
key: ${{ runner.os }}-simgrid-python-${{ hashFiles('.github/workflows/weekly-checks.yml') }}
157+
key: ${{ runner.os }}-simgrid-python-v2
158158

159159
- name: Install SimGrid
160160
if: steps.cache-simgrid.outputs.cache-hit != 'true'
@@ -170,7 +170,7 @@ jobs:
170170
id: cache-fsmod
171171
with:
172172
path: /opt/fsmod
173-
key: ${{ runner.os }}-fsmod-python-${{ hashFiles('.github/workflows/weekly-checks.yml') }}
173+
key: ${{ runner.os }}-fsmod-python-v2
174174

175175
- name: Install FSMod
176176
if: steps.cache-fsmod.outputs.cache-hit != 'true'
@@ -186,7 +186,7 @@ jobs:
186186
id: cache-gtest
187187
with:
188188
path: /opt/gtest
189-
key: ${{ runner.os }}-gtest-${{ hashFiles('.github/workflows/weekly-checks.yml') }}
189+
key: ${{ runner.os }}-gtest-v1
190190

191191
- name: Install Google Test
192192
if: steps.cache-gtest.outputs.cache-hit != 'true'

0 commit comments

Comments
 (0)