From ed2ecc40b7e7b03daa39de89d7d1287b25825b57 Mon Sep 17 00:00:00 2001 From: Steven de Oliveira Date: Fri, 27 Aug 2021 11:59:33 +0200 Subject: [PATCH 1/3] Latest version of opam --- .github/workflows/build_macos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml index e3f3a642c..3b4c2ae8e 100644 --- a/.github/workflows/build_macos.yml +++ b/.github/workflows/build_macos.yml @@ -57,8 +57,8 @@ jobs: # Install external dependencies # remove this step when opam 2.1 will be used - - name: opam install depext - run: opam depext alt-ergo-lib alt-ergo-parsers alt-ergo altgr-ergo + #- name: opam install depext + # run: opam depext alt-ergo-lib alt-ergo-parsers alt-ergo altgr-ergo # Install dependencies - name: Install deps From 936bc0b37b0c7c3e42e249df9bcf88b201828712 Mon Sep 17 00:00:00 2001 From: Steven de Oliveira Date: Fri, 27 Aug 2021 12:09:37 +0200 Subject: [PATCH 2/3] Starting CI on branch 'fix-ci' --- .github/workflows/build_docker.yml | 1 + .github/workflows/build_macos.yml | 1 + .github/workflows/build_windows.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml index 56cb79f0f..328ddee96 100644 --- a/.github/workflows/build_docker.yml +++ b/.github/workflows/build_docker.yml @@ -6,6 +6,7 @@ name: Build with ocp Docker container on: push: branches: + - fix-ci - next - main diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml index 3b4c2ae8e..5b1abc264 100644 --- a/.github/workflows/build_macos.yml +++ b/.github/workflows/build_macos.yml @@ -6,6 +6,7 @@ name: Build MacOS on: push: branches: + - fix-ci - next - main diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index 05c56e4a1..dee7867b5 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -4,6 +4,7 @@ name: Build Windows on: push: branches: + - fix-ci - next - main From 1e155fdc9b1684e023a8795c685aa7d8705288ed Mon Sep 17 00:00:00 2001 From: Steven de Oliveira Date: Fri, 27 Aug 2021 12:20:24 +0200 Subject: [PATCH 3/3] Adding depext --- .github/workflows/build_macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml index 5b1abc264..12c42f550 100644 --- a/.github/workflows/build_macos.yml +++ b/.github/workflows/build_macos.yml @@ -63,7 +63,7 @@ jobs: # Install dependencies - name: Install deps - run: opam install ./*.opam --deps-only --with-test + run: opam install ./*.opam --deps-only --with-test --depext # Build and install with opam