Skip to content

Commit e9c79ad

Browse files
committed
Merge the 2 Cygwin workflows into 1 workflow with 2 jobs
Use "needs:" to ensure they are sequentially (to reuse the compiler built in the first part for the second) and still having a full 6 hours timeout each "always()" ensures that "part2" runs even if a test failed in "part1"
1 parent 2d37a01 commit e9c79ad

File tree

4 files changed

+27
-31
lines changed

4 files changed

+27
-31
lines changed
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Cygwin trunk
2+
3+
on: [push, pull_request, workflow_dispatch]
4+
5+
jobs:
6+
part1:
7+
uses: ./.github/workflows/common.yml
8+
with:
9+
runs_on: windows-latest
10+
compiler: ocaml.5.1.0
11+
cygwin: true
12+
compiler_git_ref: refs/heads/trunk
13+
timeout: 360
14+
subsuite: src/array src/atomic src/bigarray src/buffer src/bytes src/domain src/dynlink src/ephemeron src/floatarray src/hashtbl src/io
15+
16+
part2:
17+
needs: part1
18+
if: ${{ always() }}
19+
uses: ./.github/workflows/common.yml
20+
with:
21+
runs_on: windows-latest
22+
compiler: ocaml.5.1.0
23+
cygwin: true
24+
compiler_git_ref: refs/heads/trunk
25+
timeout: 360
26+
subsuite: src/lazy src/neg_tests src/queue src/semaphore src/stack src/statistics src/sys src/thread src/threadomain src/weak

.github/workflows/cygwin1-510-trunk-workflow.yml

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

.github/workflows/cygwin2-510-trunk-workflow.yml

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

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ Multicore tests
1616
[![Linux 32-bit 5.1.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-510-32bit-trunk-workflow.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/linux-510-32bit-trunk-workflow.yml)
1717
[![Windows 5.1.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/windows-510-trunk-workflow.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/windows-510-trunk-workflow.yml)
1818
[![Windows 5.1.0+trunk-bytecode](https://github.com/ocaml-multicore/multicoretests/actions/workflows/windows-510-trunk-bytecode-workflow.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/windows-510-trunk-bytecode-workflow.yml)
19-
20-
[![Cygwin trunk (1)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/cygwin1-510-trunk-workflow.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/cygwin1-510-trunk-workflow.yml)
21-
[![Cygwin trunk (2)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/cygwin2-510-trunk-workflow.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/cygwin2-510-trunk-workflow.yml)
19+
[![Cygwin 5.1.0+trunk](https://github.com/ocaml-multicore/multicoretests/actions/workflows/cygwin-510-trunk-workflow.yml/badge.svg)](https://github.com/ocaml-multicore/multicoretests/actions/workflows/cygwin-510-trunk-workflow.yml)
2220

2321
Property-based tests of (parts of) the OCaml multicore compiler and run time.
2422

0 commit comments

Comments
 (0)