Merge pull request #420 from ocaml-multicore/merge-cygwin-parts

Merge Cygwin CI workflow parts

.github/workflows/common.yml

@@ -64,10 +64,6 @@ on:
           Defaults to custom_compiler_version chunked at [+~-]
         type: string
         default: ''
-    outputs:
-      skippart2:
-        description: 'Whether Part 2 (Cygwin workflow) should be skipped (because we are running only one test)'
-        value: ${{ jobs.test.outputs.skipnextjob }}
 
 jobs:
   test:
@@ -92,9 +88,6 @@ jobs:
 
     timeout-minutes: ${{ inputs.timeout }}
 
-    outputs:
-      skipnextjob: ${{ steps.mainstep.outputs.skipnextjob }}
-
     steps:
       - name: Configure environment (Cygwin)
         run: |

.github/workflows/cygwin-51x.yml

@@ -3,22 +3,10 @@ name: Cygwin 5.1
 on: [push, pull_request, workflow_dispatch]
 
 jobs:
-  part1:
+  build:
     uses: ./.github/workflows/common.yml
     with:
       runs_on: windows-latest
       compiler: ocaml-variants.5.1.1~rc1+options+win
       cygwin: true
       timeout: 360
-      dune_alias: 'ci1'
-
-  part2:
-    needs: part1
-    if: ${{ always() && needs.part1.outputs.skippart2 != 'true' }}
-    uses: ./.github/workflows/common.yml
-    with:
-      runs_on: windows-latest
-      compiler: ocaml-variants.5.1.1~rc1+options+win
-      cygwin: true
-      timeout: 360
-      dune_alias: 'ci2'

.github/workflows/cygwin-520-trunk.yml

@@ -3,24 +3,11 @@ name: Cygwin trunk
 on: [push, pull_request, workflow_dispatch]
 
 jobs:
-  part1:
+  build:
     uses: ./.github/workflows/common.yml
     with:
       runs_on: windows-latest
       compiler: ocaml.5.2.0
       cygwin: true
       compiler_git_ref: refs/heads/trunk
       timeout: 360
-      dune_alias: 'ci1'
-
-  part2:
-    needs: part1
-    if: ${{ always() && needs.part1.outputs.skippart2 != 'true' }}
-    uses: ./.github/workflows/common.yml
-    with:
-      runs_on: windows-latest
-      compiler: ocaml.5.2.0
-      cygwin: true
-      compiler_git_ref: refs/heads/trunk
-      timeout: 360
-      dune_alias: 'ci2'

dune

@@ -25,36 +25,6 @@
   (alias_rec %{env:DUNE_CI_ALIAS=runtest})))
   ; (alias_rec focusedtest)))
 
-(alias
- (name ci1)
- (package multicoretests)
- (deps
-  (alias_rec src/array/runtest)
-  (alias_rec src/atomic/runtest)
-  (alias_rec src/bigarray/runtest)
-  (alias_rec src/buffer/runtest)
-  (alias_rec src/bytes/runtest)
-  (alias_rec src/domain/runtest)
-  (alias_rec src/dynlink/runtest)
-  (alias_rec src/ephemeron/runtest)
-  (alias_rec src/floatarray/runtest)
-  (alias_rec src/hashtbl/runtest)
-  (alias_rec src/io/runtest)))
-
-(alias
- (name ci2)
- (package multicoretests)
- (deps
-  (alias_rec src/lazy/runtest)
-  (alias_rec src/neg_tests/runtest)
-  (alias_rec src/queue/runtest)
-  (alias_rec src/semaphore/runtest)
-  (alias_rec src/stack/runtest)
-  (alias_rec src/sys/runtest)
-  (alias_rec src/thread/runtest)
-  (alias_rec src/threadomain/runtest)
-  (alias_rec src/weak/runtest)))
-
 ; @focusedtest
 ; repeat a single test a couple of times
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -74,10 +44,6 @@
  (action
   (no-infer
    (progn
-    (system "echo skipnextjob=true >> \"%{env:GITHUB_OUTPUT=dummy_file}\"")
-     ; ^ this is to ensure only one job is run in multi-job GitHub
-     ; workflows (only Cygwin at the moment)
-
     (write-file hoped "")
     (write-file failed-runs "")
     (bash
@@ -93,10 +59,6 @@
  (action
   (no-infer
    (progn
-    (system "echo skipnextjob=true >> %{env:GITHUB_OUTPUT=dummy_file}")
-     ; ^ this is to ensure only one job is run in multi-job GitHub
-     ; workflows (only Cygwin at the moment)
-
     (write-file hoped "")
     (write-file failed-runs "")
     (run cmd /q /c