Skip to content

Commit 8d60d05

Browse files
authored
Introduce DaCapo cache job dependency (#208)
This commit also allows the old CI runs to be canceled if the PR is updated. Closes #197.
1 parent 2477658 commit 8d60d05

File tree

3 files changed

+43
-33
lines changed

3 files changed

+43
-33
lines changed

.github/workflows/ci-assert.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
name: Dacapo Tests
1+
name: DaCapo Tests
22

33
on:
44
pull_request:
55
branches:
66
- master
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
10+
cancel-in-progress: true
11+
812
jobs:
913
test:
1014
runs-on: ubuntu-18.04
@@ -16,13 +20,13 @@ jobs:
1620
./.github/scripts/ci-setup.sh
1721
1822
# Run the tests
19-
- name: Dacapo Tests
23+
- name: DaCapo Tests
2024
run: |
2125
./.github/scripts/ci-build.sh
2226
./.github/scripts/ci-test-only-normal.sh
23-
- name: DaCapo Tests for Global Allocation Bit
27+
- name: DaCapo Tests with global allocation bit
2428
run: ./.github/scripts/ci-test-global-alloc-bit.sh
25-
- name: DaCapo Tests for malloc mark sweep
29+
- name: DaCapo Tests with malloc Mark-Sweep
2630
run: ./.github/scripts/ci-test-malloc-mark-sweep.sh
2731

2832
# Style check
@@ -39,11 +43,24 @@ jobs:
3943
./.github/scripts/ci-setup.sh
4044
4145
# Run the tests
42-
- name: Dacapo Tests with Weak ref
46+
- name: DaCapo Tests with weak reference processing
4347
run: |
4448
./.github/scripts/ci-build.sh
4549
./.github/scripts/ci-test-only-weak-ref.sh
4650
51+
test-assertions:
52+
runs-on: ubuntu-18.04
53+
steps:
54+
- uses: actions/checkout@v2
55+
- name: Setup Environments
56+
run: |
57+
./.github/scripts/ci-checkout.sh
58+
./.github/scripts/ci-setup.sh
59+
60+
# Run the tests with assertions
61+
- name: DaCapo Test (with extreme_assertions)
62+
run: ./.github/scripts/ci-test-assertions.sh
63+
4764
msrv:
4865
runs-on: ubuntu-18.04
4966
steps:

.github/workflows/main.yml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- master
77

88
concurrency:
9-
group: ${{ github.workflow }}-${{ github.ref }}
9+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
1010
cancel-in-progress: true
1111

1212
jobs:
@@ -49,10 +49,29 @@ jobs:
4949
path: ./git/openjdk/build/linux-x86_64-normal-server-${{ matrix.debug-level }}/bundles/*_bin.tar.gz
5050
retention-days: 2
5151

52+
cache-dacapo:
53+
name: Cache DaCapo Chopin git-04132797
54+
runs-on: ubuntu-22.04
55+
steps:
56+
- name: Check DaCapo Chopin git-04132797 cache
57+
id: dacapo-04132797
58+
uses: actions/cache@v3
59+
with:
60+
path: dacapo/dacapo-evaluation-git-04132797.zip
61+
key: dacapo-chopin-git-04132797
62+
- name: Install DaCapo Chopin git-04132797
63+
if: steps.dacapo-04132797.outputs.cache-hit != 'true'
64+
run: |
65+
mkdir -p dacapo
66+
pushd dacapo
67+
wget -q "https://download.dacapobench.org/dacapo-evaluation-git-04132797.zip" -O dacapo-evaluation-git-04132797.zip
68+
popd
69+
5270
test-linux-x64:
5371
name: linux-x64
5472
needs:
5573
- build-linux-x64
74+
- cache-dacapo
5675
runs-on: ubuntu-22.04
5776
strategy:
5877
fail-fast: false
@@ -95,13 +114,7 @@ jobs:
95114
with:
96115
path: dacapo/dacapo-evaluation-git-04132797.zip
97116
key: dacapo-chopin-git-04132797
98-
- name: Install DaCapo Chopin git-04132797
99-
if: steps.dacapo-04132797.outputs.cache-hit != 'true'
100-
run: |
101-
mkdir -p dacapo
102-
pushd dacapo
103-
wget -q "https://cloudstor.aarnet.edu.au/plus/s/9cMreAgANcMUOzq/download" -O dacapo-evaluation-git-04132797.zip
104-
popd
117+
fail-on-cache-miss: true # We should never have a cache miss here as we cache DaCapo in an earlier job
105118
- name: Unzip DaCapo Chopin git-04132797
106119
run: |
107120
pushd dacapo

0 commit comments

Comments
 (0)