From e976c47510e133e233f3dd490a2f20f3a923511c Mon Sep 17 00:00:00 2001 From: Cristiano Calcagno Date: Mon, 25 Jan 2021 10:12:38 +0100 Subject: [PATCH 01/11] See what's up with Windows CI. --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a932ccb3..221aa39c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -211,7 +211,6 @@ jobs: PATH: /cygdrive/c/Program Files/nodejs:/usr/local/bin:/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0 command: | pwd - ls -l echo "Versions" node --version npm --version From 8eead28ad808dba2ee7bad585221a34379c78a0a Mon Sep 17 00:00:00 2001 From: Cristiano Calcagno Date: Mon, 25 Jan 2021 10:21:08 +0100 Subject: [PATCH 02/11] Update config.yml --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 221aa39c..bc07ab71 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -213,7 +213,6 @@ jobs: pwd echo "Versions" node --version - npm --version - restore_cache: keys: - v0-opam-cache-{{ arch }} From c962987a53085f2bb80b84da5e371880dba53457 Mon Sep 17 00:00:00 2001 From: Cristiano Calcagno Date: Tue, 26 Jan 2021 09:44:49 +0100 Subject: [PATCH 03/11] Update config.yml --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bc07ab71..e5b52bb5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -208,9 +208,10 @@ jobs: name: Check node / npm version shell: C:/tools/cygwin/bin/bash.exe --noprofile --norc -eo pipefail environment: - PATH: /cygdrive/c/Program Files/nodejs:/usr/local/bin:/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0 + PATH: /usr/local/bin:/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0 command: | pwd + ls -l echo "Versions" node --version - restore_cache: From ca651499f42133ce20e7d770943ec0172363b619 Mon Sep 17 00:00:00 2001 From: Cristiano Calcagno Date: Tue, 26 Jan 2021 09:54:34 +0100 Subject: [PATCH 04/11] Update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e5b52bb5..48d618f0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -207,8 +207,8 @@ jobs: - run: name: Check node / npm version shell: C:/tools/cygwin/bin/bash.exe --noprofile --norc -eo pipefail - environment: - PATH: /usr/local/bin:/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0 +# environment: +# PATH: /usr/local/bin:/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0 command: | pwd ls -l From 9d232b7e488ca6952575c574a5ce2fb424c46844 Mon Sep 17 00:00:00 2001 From: Cristiano Calcagno Date: Tue, 26 Jan 2021 10:24:01 +0100 Subject: [PATCH 05/11] Update config.yml --- .circleci/config.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 48d618f0..5c8cd0b9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -35,7 +35,7 @@ orbs: steps: - run: name: Init opam - shell: C:/tools/cygwin/bin/bash.exe --noprofile --norc -eo pipefail + shell: C:/tools/cygwin/bin/bash.exe -leo pipefail command: | export PATH=$PATH:/usr/local/bin:/usr/bin [ -d ~/.opam ] || opam init default 'https://github.com/fdopen/opam-repository-mingw.git#opam2' --bare --disable-sandboxing @@ -43,7 +43,7 @@ orbs: steps: - run: name: Create opam switch - shell: C:/tools/cygwin/bin/bash.exe --noprofile --norc -eo pipefail + shell: C:/tools/cygwin/bin/bash.exe -leo pipefail environment: PATH: /usr/local/bin:/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0 command: | @@ -206,9 +206,9 @@ jobs: at: ./artifacts - run: name: Check node / npm version - shell: C:/tools/cygwin/bin/bash.exe --noprofile --norc -eo pipefail -# environment: -# PATH: /usr/local/bin:/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0 + shell: C:/tools/cygwin/bin/bash.exe -leo pipefail + environment: + PATH: /cygdrive/c/Program Files/nodejs:/usr/local/bin:/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0 command: | pwd ls -l @@ -221,7 +221,7 @@ jobs: - opam_windows/create_switch - run: name: Install opam dev dependencies - shell: C:/tools/cygwin/bin/bash.exe --noprofile --norc -eo pipefail + shell: C:/tools/cygwin/bin/bash.exe -leo pipefail environment: PATH: /cygdrive/c/Program Files/nodejs:/usr/local/bin:/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0 command: | @@ -234,7 +234,7 @@ jobs: - _opam - run: name: Build & Test - shell: C:/tools/cygwin/bin/bash.exe --noprofile --norc -eo pipefail + shell: C:/tools/cygwin/bin/bash.exe -leo pipefail environment: PATH: /cygdrive/c/Program Files/nodejs:/usr/local/bin:/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0 command: | From 6a43abb2b5724359dbaf80880ab72d9d7398d75f Mon Sep 17 00:00:00 2001 From: Cristiano Calcagno Date: Tue, 26 Jan 2021 12:45:30 +0100 Subject: [PATCH 06/11] Update config.yml --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5c8cd0b9..46fd2855 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,6 +47,7 @@ orbs: environment: PATH: /usr/local/bin:/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0 command: | + cd /cygdrive/c/Users/circleci/project [ -d _opam ] || opam switch create . ocaml-variants.4.06.1+mingw64c --deps-only --yes -vvv executors: @@ -238,6 +239,7 @@ jobs: environment: PATH: /cygdrive/c/Program Files/nodejs:/usr/local/bin:/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0 command: | + cd /cygdrive/c/Users/circleci/project eval $(opam env) dune build ./_build/install/default/bin/rescript-editor-support.exe --help From 91bf25dac11e881b6aebafb58d069662d055febf Mon Sep 17 00:00:00 2001 From: Cristiano Calcagno Date: Tue, 26 Jan 2021 12:47:37 +0100 Subject: [PATCH 07/11] Update config.yml --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 46fd2855..414ddb23 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -211,10 +211,12 @@ jobs: environment: PATH: /cygdrive/c/Program Files/nodejs:/usr/local/bin:/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0 command: | + cd /cygdrive/c/Users/circleci/project pwd ls -l echo "Versions" node --version + npm --version - restore_cache: keys: - v0-opam-cache-{{ arch }} From 0b1ba9b6afbd639425cdac4a8b70702a001ab631 Mon Sep 17 00:00:00 2001 From: Cristiano Calcagno Date: Tue, 26 Jan 2021 12:57:17 +0100 Subject: [PATCH 08/11] Update config.yml --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 414ddb23..ac6b723e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,7 +37,6 @@ orbs: name: Init opam shell: C:/tools/cygwin/bin/bash.exe -leo pipefail command: | - export PATH=$PATH:/usr/local/bin:/usr/bin [ -d ~/.opam ] || opam init default 'https://github.com/fdopen/opam-repository-mingw.git#opam2' --bare --disable-sandboxing create_switch: steps: From 7f90b3078a428f341f5c4931cadb84e8319cf61e Mon Sep 17 00:00:00 2001 From: Cristiano Calcagno Date: Tue, 26 Jan 2021 12:58:27 +0100 Subject: [PATCH 09/11] Update config.yml --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ac6b723e..1136cf6f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -46,7 +46,6 @@ orbs: environment: PATH: /usr/local/bin:/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0 command: | - cd /cygdrive/c/Users/circleci/project [ -d _opam ] || opam switch create . ocaml-variants.4.06.1+mingw64c --deps-only --yes -vvv executors: From 3ae515313d3c9dc15bca0e443fbf4acf38e3d539 Mon Sep 17 00:00:00 2001 From: Cristiano Calcagno Date: Tue, 26 Jan 2021 13:09:50 +0100 Subject: [PATCH 10/11] Update config.yml --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1136cf6f..c42bcf6d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -46,6 +46,7 @@ orbs: environment: PATH: /usr/local/bin:/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0 command: | + cd /cygdrive/c/Users/circleci/project [ -d _opam ] || opam switch create . ocaml-variants.4.06.1+mingw64c --deps-only --yes -vvv executors: @@ -226,6 +227,7 @@ jobs: environment: PATH: /cygdrive/c/Program Files/nodejs:/usr/local/bin:/usr/bin:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0 command: | + cd /cygdrive/c/Users/circleci/project eval $(opam env) opam install reason.3.6.0 dune.1.11.4 ocaml-migrate-parsetree.1.3.1 ppx_tools_versioned uri --yes | cat - save_cache: From 6453ae58ace446f6b0d3c7dd6358e659afee2cdd Mon Sep 17 00:00:00 2001 From: Cristiano Calcagno Date: Tue, 26 Jan 2021 13:24:05 +0100 Subject: [PATCH 11/11] Update config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c42bcf6d..74d4b2e8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -218,7 +218,7 @@ jobs: npm --version - restore_cache: keys: - - v0-opam-cache-{{ arch }} + - v2-opam-cache-{{ arch }} - opam_windows/init - opam_windows/create_switch - run: @@ -231,7 +231,7 @@ jobs: eval $(opam env) opam install reason.3.6.0 dune.1.11.4 ocaml-migrate-parsetree.1.3.1 ppx_tools_versioned uri --yes | cat - save_cache: - key: v0-opam-cache-{{ arch }} + key: v2-opam-cache-{{ arch }} paths: - C:/tools/cygwin/home/circleci/.opam - _opam