From 88d24b7a64159b2955dc7414aba8267e353b3c0a Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Wed, 31 Jul 2024 01:47:26 -0700 Subject: [PATCH 1/8] Update coq-windows.yml: remove depext and sunset repo --- .github/workflows/coq-windows.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/coq-windows.yml b/.github/workflows/coq-windows.yml index 18fbf420c5..9e826dc2b9 100644 --- a/.github/workflows/coq-windows.yml +++ b/.github/workflows/coq-windows.yml @@ -44,10 +44,6 @@ 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 --kind=version coq ${{ env.COQ_VERSION }} - run: opam install js_of_ocaml From d69f6540604427b811a95bb70a3868bb9a49e1b1 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Mon, 5 Aug 2024 11:28:16 -0700 Subject: [PATCH 2/8] Update coq-windows.yml: pin ocamlfind fix --- .github/workflows/coq-windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/coq-windows.yml b/.github/workflows/coq-windows.yml index 9e826dc2b9..58ca848fc7 100644 --- a/.github/workflows/coq-windows.yml +++ b/.github/workflows/coq-windows.yml @@ -44,6 +44,7 @@ jobs: uses: ocaml/setup-ocaml@v3 with: ocaml-compiler: 4.13.1 + - run: opam pin add ocamlfind 'git+https://github.com/db4/ocamlfind.git#win32-fix' - run: opam pin add --kind=version coq ${{ env.COQ_VERSION }} - run: opam install js_of_ocaml From 309cdff13a0e940226e0d52e677a6e2d7ea277d7 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Mon, 5 Aug 2024 16:46:19 -0700 Subject: [PATCH 3/8] Update coq-windows.yml --- .github/workflows/coq-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coq-windows.yml b/.github/workflows/coq-windows.yml index 58ca848fc7..a7ceb6cf41 100644 --- a/.github/workflows/coq-windows.yml +++ b/.github/workflows/coq-windows.yml @@ -44,7 +44,7 @@ jobs: uses: ocaml/setup-ocaml@v3 with: ocaml-compiler: 4.13.1 - - run: opam pin add ocamlfind 'git+https://github.com/db4/ocamlfind.git#win32-fix' + - run: opam pin add ocamlfind 'git+https://github.com/JasonGross/ocamlfind.git#win32-fix' - run: opam pin add --kind=version coq ${{ env.COQ_VERSION }} - run: opam install js_of_ocaml From 54b4e3d832ef48b5d0b233c0a3a9ad1151c01fc2 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Mon, 9 Sep 2024 23:19:32 -0700 Subject: [PATCH 4/8] use opam conf-time to install Windows depa setup-ocaml no longer exposes cygwin --- .github/workflows/coq-windows.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/coq-windows.yml b/.github/workflows/coq-windows.yml index a7ceb6cf41..e0b5c357da 100644 --- a/.github/workflows/coq-windows.yml +++ b/.github/workflows/coq-windows.yml @@ -47,17 +47,9 @@ jobs: - run: opam pin add ocamlfind 'git+https://github.com/JasonGross/ocamlfind.git#win32-fix' - 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 From dce84b967fb931100924130dbad2ae78faedfc49 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Mon, 9 Sep 2024 23:31:08 -0700 Subject: [PATCH 5/8] pin upstream ocamlfind --- .github/workflows/coq-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coq-windows.yml b/.github/workflows/coq-windows.yml index e0b5c357da..595217b8a8 100644 --- a/.github/workflows/coq-windows.yml +++ b/.github/workflows/coq-windows.yml @@ -44,7 +44,7 @@ jobs: uses: ocaml/setup-ocaml@v3 with: ocaml-compiler: 4.13.1 - - run: opam pin add ocamlfind 'git+https://github.com/JasonGross/ocamlfind.git#win32-fix' + - 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 - run: opam install conf-time From b0f76c6d1b89529a5e4f149f7853214acdebc1cc Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Mon, 9 Sep 2024 23:47:49 -0700 Subject: [PATCH 6/8] Update coq-windows.yml --- .github/workflows/coq-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coq-windows.yml b/.github/workflows/coq-windows.yml index 595217b8a8..60bbb8c668 100644 --- a/.github/workflows/coq-windows.yml +++ b/.github/workflows/coq-windows.yml @@ -49,7 +49,7 @@ jobs: - run: opam install js_of_ocaml - run: opam install conf-time - name: Work around https://github.com/actions/checkout/issues/766 - run: opam exec -- git config --global --add safe.directory "*" + run: opam exec -- bash -l -c 'git config --global --add safe.directory "*"' - name: echo build params run: .\etc\ci\describe-system-config-win.ps1 - name: deps From ee5d84b3a02ba2c2c4ba93c9d6aee3fb83b0fa67 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Thu, 19 Sep 2024 16:39:48 -0700 Subject: [PATCH 7/8] Don't indirect through bash --- .github/workflows/coq-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coq-windows.yml b/.github/workflows/coq-windows.yml index 60bbb8c668..595217b8a8 100644 --- a/.github/workflows/coq-windows.yml +++ b/.github/workflows/coq-windows.yml @@ -49,7 +49,7 @@ jobs: - run: opam install js_of_ocaml - run: opam install conf-time - name: Work around https://github.com/actions/checkout/issues/766 - run: opam exec -- bash -l -c 'git config --global --add safe.directory "*"' + run: opam exec -- git config --global --add safe.directory "*" - name: echo build params run: .\etc\ci\describe-system-config-win.ps1 - name: deps From d2e3c2ebf188de95118911297427ae57d173f2b9 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Thu, 19 Sep 2024 16:47:39 -0700 Subject: [PATCH 8/8] Update coq-opam-package.yml --- .github/workflows/coq-opam-package.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/coq-opam-package.yml b/.github/workflows/coq-opam-package.yml index e0b51d76f2..5df6272114 100644 --- 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 }}