@@ -22,58 +22,44 @@ concurrency:
2222 cancel-in-progress : true
2323
2424jobs :
25- build-linux :
26- permissions :
27- contents : read
28- actions : write
29- uses : ./.github/workflows/build.yml
30- with :
31- host : linux-x86_64
32- runs-on : ubuntu-24.04
33- prewarm : gcc 16.1.0-musl; llvm 23.1.3; mingw-cross 16.1.0
34-
35- unit-linux-archive :
36- permissions :
37- contents : read
38- actions : read
39- uses : ./.github/workflows/ci-unit.yml
40- with :
41- stage : archive
42- host : linux-x86_64
43- name : linux
44- runs-on : ubuntu-24.04
45- tests : e2e/windows
46-
25+ # The third round measures trees/955 alone only. The mcpp and the test archive are
26+ # those of the second round's run (44723402028): its sources are this commit's, the
27+ # workflow alone differs, so they are not built again.
4728 measure :
4829 name : trees ${{ matrix.cond }} ${{ matrix.id }}
49- needs : [build-linux, unit-linux-archive]
5030 runs-on : ubuntu-24.04
5131 timeout-minutes : 120
5232 strategy :
5333 fail-fast : false
5434 matrix :
55- # The first round measured shard 2/4 twice: with main's history the trees
56- # suite is assigned to another shard, so this round measures the other three.
35+ # Round 1 measured shard 2/4 twice, round 2 the shards 1/4, 3/4 and 4/4.
5736 include :
5837 - { cond: alone, id: '1' }
5938 - { cond: alone, id: '2' }
60- - { cond: shard, id: s1, shard: 1/4 }
61- - { cond: shard, id: s3, shard: 3/4 }
62- - { cond: shard, id: s4, shard: 4/4 }
6339 steps :
6440 - uses : actions/checkout@v4
6541
6642 - uses : ./.github/actions/bootstrap-mcpp
6743
68- - uses : ./.github/actions/use-built-mcpp
44+ - name : The second round's mcpp
45+ uses : actions/download-artifact@v4
6946 with :
70- host : linux-x86_64
47+ name : mcpp-built-linux-x86_64
48+ path : ${{ runner.temp }}/mcpp-built
49+ run-id : 44723402028
50+ github-token : ${{ github.token }}
51+
52+ - name : Use it
53+ shell : bash
54+ run : bash .github/actions/use-built-mcpp/use.sh linux-x86_64 GLOBAL
7155
72- - name : The tests of this run
56+ - name : The second round's tests
7357 uses : actions/download-artifact@v4
7458 with :
7559 name : mcpp-unit-linux-x86_64
7660 path : ${{ runner.temp }}/unit
61+ run-id : 44723402028
62+ github-token : ${{ github.token }}
7763
7864 - name : The program under test and the probe's recorder
7965 shell : bash
@@ -104,13 +90,15 @@ jobs:
10490 shell : bash
10591 run : |
10692 set -uo pipefail
107- # `--cases` from an archive lists nothing and ends "no test ... ran" (exit 1):
108- # recorded, not fatal.
109- "$MCPP" test --cases --archive "$RUNNER_TEMP/unit/unit.tar.gz" e2e/openkal/trees 2>&1 | tail -40 || true
93+ # The archive's program is `e2e/openkal`; `e2e/openkal/trees` is a part of it,
94+ # and an archive run selects by the program's name only (round 2: "no test ...
95+ # ran"). The case is named whole: a pattern with `*` under the listed case
96+ # `trees` selects all of `trees`.
11097 for phase in cold warm; do
11198 echo "$phase" > "$PROBE_DIR/phase"
11299 echo "== $phase $(date -u +%T)"
113- "$MCPP" test --timeout 0 --archive "$RUNNER_TEMP/unit/unit.tar.gz" e2e/openkal/trees --case 'trees/955*' \
100+ "$MCPP" test --timeout 0 --archive "$RUNNER_TEMP/unit/unit.tar.gz" e2e/openkal \
101+ --case 'trees/955 the openkal set is one tree of every architecture' \
114102 || echo "::warning::the $phase pass ended with $?"
115103 done
116104
0 commit comments