Skip to content

Commit

Permalink
Re-enable Github actions CI (ocaml#1831)
Browse files Browse the repository at this point in the history
* Re-enable Github actions CI
* Disable tests printing paths on windows
  • Loading branch information
voodoos authored Sep 19, 2024
1 parent 03b5cb5 commit 86b7ae9
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: CI
# events but only for the master branch
on:
push:
branches: [ master; 500 ]
branches: [ main ]
paths-ignore:
- '**.md'
- '**.txt'
Expand All @@ -16,7 +16,7 @@ on:
- 'vim/**'
- '**/emacs-lint.yml'
pull_request:
branches: [ master ]
branches: [ main ]
paths-ignore:
- '**.md'
- '**.txt'
Expand All @@ -38,7 +38,7 @@ jobs:
os:
- macos-latest
- ubuntu-latest
# - windows-latest
- windows-latest
ocaml-compiler:
- 5.2.x
# The type of runner that the job will run on
Expand Down
2 changes: 1 addition & 1 deletion tests/test-dirs/config/dot-merlin-reader/dune
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(cram
(applies_to erroneous-config quoting)
(applies_to erroneous-config quoting load-config)
(enabled_if
(<> %{os_type} Win32)))
2 changes: 1 addition & 1 deletion tests/test-dirs/config/dune
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(cram
(applies_to path-expansion)
(applies_to path-expansion hidden-deps)
(enabled_if
(<> %{os_type} Win32)))

Expand Down
4 changes: 4 additions & 0 deletions tests/test-dirs/hidden-deps/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
(cram
(applies_to hd-directives)
(enabled_if
(<> %{os_type} Win32)))
3 changes: 2 additions & 1 deletion tests/test-dirs/locate/dune
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
(cram
(applies_to looping-substitution mutually-recursive partial-cmt includes
issue802 issue845 issue1199 issue1524 sig-substs l-413-features
module-aliases locate-constrs without-implem without-sig module-decl-aliases)
module-aliases locate-constrs without-implem without-sig module-decl-aliases
in-implicit-trans-dep)
(enabled_if
(<> %{os_type} Win32)))

Expand Down
6 changes: 6 additions & 0 deletions tests/test-dirs/occurrences/project-wide/dune
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
(applies_to pwo-ml-gen)
(enabled_if (>= %{read:version/dune.txt} "3.16")))

(cram
(applies_to :whole_subtree)
(enabled_if
(<> %{os_type} Win32)))

(subdir
version
(rule (action (with-stdout-to dune.txt (run dune --version)))))

9 changes: 6 additions & 3 deletions tests/test-dirs/server-tests/dune
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@
(locks merlin_server))

(cram
(applies_to chdir_to_root)
(applies_to chdir_to_root incremental-index)
(enabled_if
(<> %{os_type} Win32)))

(cram
(applies_to pwo-uid-stability)
(enabled_if %{bin-available:ocaml-index}))
(applies_to pwo-uid-stability )
(enabled_if
(and
%{bin-available:ocaml-index}
(<> %{os_type} Win32))))

0 comments on commit 86b7ae9

Please sign in to comment.