[CI] Adjust Windows opam config for ocaml/setup-ocaml 3 (#1939)

* Update coq-windows.yml: remove depext and sunset repo * Update coq-windows.yml: pin ocamlfind fix * Update coq-windows.yml * use opam conf-time to install Windows depa setup-ocaml no longer exposes cygwin * pin upstream ocamlfind * Update coq-windows.yml * Don't indirect through bash * Update coq-opam-package.yml --------- Co-authored-by: Jason Gross <[email protected]>
mit-plv · Sep 20, 2024 · 15f63d0 · 15f63d0
1 parent 23e42a9
commit 15f63d0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 22 deletions.
diff --git a/.github/workflows/coq-opam-package.yml b/.github/workflows/coq-opam-package.yml
@@ -21,19 +21,19 @@ jobs:
               runs-on: 'ubuntu-latest',
               ocaml-compiler: '4.09.1',
               coq-extra-flags: '',
-              extra-ocaml-repositories: '',
+              ocamlfind-pin: '',
               opam-jobs-flag: ''},
              {name: 'macOS',
               runs-on: 'macos-latest',
               ocaml-compiler: '4.14.2',
               coq-extra-flags: '',
-              extra-ocaml-repositories: '',
+              ocamlfind-pin: '',
               opam-jobs-flag: ''},
              {name: 'Windows',
               runs-on: 'windows-latest',
               ocaml-compiler: '4.13.1',
               coq-extra-flags: '-async-proofs-j 1',
-              extra-ocaml-repositories: 'opam-repository-mingw: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset',
+              ocamlfind-pin: 'git+https://github.com/ocaml/ocamlfind.git#master',
               opam-jobs-flag: '-j 1'}]
 
     runs-on: ${{ matrix.os.runs-on }}
@@ -47,9 +47,6 @@ jobs:
       uses: ocaml/setup-ocaml@v3
       with:
         ocaml-compiler: ${{ matrix.os.ocaml-compiler }}
-        opam-repositories: |-
-          ${{ matrix.os.extra-ocaml-repositories }}
-          default: https://github.com/ocaml/opam-repository.git
 
     - name: echo Linux build params
       run: |
@@ -114,7 +111,8 @@ jobs:
     - run: opam repo add coq-released https://coq.inria.fr/opam/released
     - run: opam repo add coq-extra-dev https://coq.inria.fr/opam/extra-dev
     - run: opam update
-    - run: opam depext coq.${{ matrix.coq-version }}
+    - run: opam pin add ocamlfind '${{ matrix.os.ocamlfind-pin }}'
+      if: matrix.os.ocamlfind-pin != ''
     - run: opam pin --kind=version add coq ${{ matrix.coq-version }}
 
     - name: echo more build params
@@ -132,7 +130,6 @@ jobs:
         echo "" | opam exec -- coqtop
         echo ::endgroup::
 
-    - run: opam exec -- opam-depext coq-fiat-crypto
     - run: opam install coq-fiat-crypto --with-test ${{ matrix.os.opam-jobs-flag }}
       env:
         COQEXTRAFLAGS: ${{ matrix.os.coq-extra-flags }}

diff --git a/.github/workflows/coq-windows.yml b/.github/workflows/coq-windows.yml
@@ -44,23 +44,12 @@ jobs:
       uses: ocaml/setup-ocaml@v3
       with:
         ocaml-compiler: 4.13.1
-        opam-repositories: |
-          opam-repository-mingw: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset
-          default: https://github.com/ocaml/opam-repository.git
-    - run: opam depext coq.${{ env.COQ_VERSION }}
+    - run: opam pin add ocamlfind 'git+https://github.com/ocaml/ocamlfind.git#master'
     - run: opam pin add --kind=version coq ${{ env.COQ_VERSION }}
     - run: opam install js_of_ocaml
-
-    - name: Install System Dependencies
-      run: |
-        %CYGWIN_ROOT%\setup-x86_64.exe -qnNdO -P time,zip
-      shell: cmd
-
+    - run: opam install conf-time
     - name: Work around https://github.com/actions/checkout/issues/766
-      run: |
-        %CYGWIN_ROOT%\bin\bash.exe -l -c 'git config --global --add safe.directory "*"'
-      shell: cmd
-
+      run: opam exec -- git config --global --add safe.directory "*"
     - name: echo build params
       run: .\etc\ci\describe-system-config-win.ps1
     - name: deps