From e5f417a741b2092397823b60b7f9ced1be8ed80d Mon Sep 17 00:00:00 2001
From: Pierre Fenoll <pierrefenoll@gmail.com>
Date: Fri, 20 Jul 2018 16:54:35 +0200
Subject: Test docsh (#291)

Once merged I'll merge #290
---
 .circleci/config.yml | 18 +++++++++++++++++-
 .travis.yml          | 45 +++++++++++++++++++++++++++++----------------
 kerl                 |  2 +-
 3 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b1f3638..a7b03f6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,7 +17,7 @@ jobs:
     docker:
       - image: alpine
     environment:
-      - _KERL_VSN: '21.0.1'
+      - _KERL_VSN: '21.0.3'
       - KERL_BUILD_BACKEND: git
       - KERL_BUILD_DOCS: 'yes'
     steps: &alpine_steps
@@ -43,6 +43,17 @@ jobs:
             source $(./kerl path install_$_KERL_VSN)/activate
             erl -s crypto -s init stop
             kerl_deactivate
+      - run: &activate_then_test_docsh
+          |
+            otp_major=$(echo "$_KERL_VSN" | cut -d. -f1)
+            if ((travis_otp_major >= 18)); then
+              source $(./kerl path install_$_KERL_VSN)/activate
+              ./kerl install-docsh
+              kerl_deactivate
+              source $(./kerl path install_$_KERL_VSN)/activate
+              erl -noshell -eval 'h(proplists).' -s init stop
+              kerl_deactivate
+            fi
       - run: ./kerl delete installation $(./kerl path install_$_KERL_VSN)
       - run: ./kerl delete build "$_KERL_VSN"
 
@@ -75,6 +86,7 @@ jobs:
       - run: ./kerl install "$_KERL_VSN" "install_$_KERL_VSN"
       - run: ./kerl status
       - run: *activate_then_test_for_crypto
+      - run: *activate_then_test_docsh
       - run: ./kerl delete installation $(./kerl path install_$_KERL_VSN)
       - run: ./kerl delete build "$_KERL_VSN"
 
@@ -102,6 +114,7 @@ jobs:
       - run: ./kerl install "$_KERL_VSN" "install_$_KERL_VSN"
       - run: ./kerl status
       - run: *activate_then_test_for_crypto
+      - run: *activate_then_test_docsh
       - run: ./kerl delete installation $(./kerl path install_$_KERL_VSN)
       - run: ./kerl delete build "$_KERL_VSN"
 
@@ -154,6 +167,7 @@ jobs:
             echo PASS app $app
           done
           kerl_deactivate
+      - run: *activate_then_test_docsh
       - run: ./kerl delete installation $(./kerl path install_$_KERL_VSN)
       - run: ./kerl delete build "$_KERL_VSN"
 
@@ -177,6 +191,7 @@ jobs:
       - run: ./kerl install "$_KERL_VSN" "install_$_KERL_VSN"
       - run: ./kerl status
       - run: *activate_then_test_for_crypto
+      - run: *activate_then_test_docsh
       - run: ./kerl delete installation $(./kerl path install_$_KERL_VSN)
       - run: ./kerl delete build "$_KERL_VSN"
 
@@ -197,5 +212,6 @@ jobs:
       - run: ./kerl install "$_KERL_VSN" "install_$_KERL_VSN"
       - run: ./kerl status
       - run: *activate_then_test_for_crypto
+      - run: *activate_then_test_docsh
       - run: ./kerl delete installation $(./kerl path install_$_KERL_VSN)
       - run: ./kerl delete build "$_KERL_VSN"
diff --git a/.travis.yml b/.travis.yml
index 18fdb8c..a60d6bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,24 +4,37 @@ os: osx
 
 env:
   global:
-    - KERL_BASE_DIR="$TMPDIR"/.kerl
-    - KERL_BUILD_BACKEND=git
-    - KERL_CONFIGURE_DISABLE_APPLICATIONS='odbc'
+  - KERL_BASE_DIR="$TMPDIR"/.kerl
+  - KERL_BUILD_BACKEND=git
+  - KERL_CONFIGURE_DISABLE_APPLICATIONS='odbc'
   matrix:
-    - _KERL_VSN=19.2
-    - _KERL_VSN=18.3
-    - _KERL_VSN=17.5
-    - _KERL_VSN=R16B03-1
+  - _KERL_VSN=21.0
+  - _KERL_VSN=20.3
+  - _KERL_VSN=19.3
+  - _KERL_VSN=18.3
+  - _KERL_VSN=17.5
+  - _KERL_VSN=R16B03-1
 
 before_script: set -e
 after_script: set +e
 script:
-  - ./kerl update releases
-  - travis_wait 45 ./kerl build "$_KERL_VSN" "$_KERL_VSN"
-  - ./kerl install "$_KERL_VSN" "install_$_KERL_VSN"
-  - ./kerl status
-  - source $(./kerl path install_$_KERL_VSN)/activate
-  - erl -s crypto -s init stop
-  - kerl_deactivate
-  - ./kerl delete installation $(./kerl path install_$_KERL_VSN)
-  - ./kerl delete build "$_KERL_VSN"
+- ./kerl update releases
+- travis_wait 45 ./kerl build "$_KERL_VSN" "$_KERL_VSN"
+- ./kerl install "$_KERL_VSN" "install_$_KERL_VSN"
+- ./kerl status
+- |
+  source $(./kerl path install_$_KERL_VSN)/activate
+  erl -s crypto -s init stop
+  kerl_deactivate
+- |
+  otp_major=$(echo "$_KERL_VSN" | cut -d. -f1)
+  if ((travis_otp_major >= 18)); then
+    source $(./kerl path install_$_KERL_VSN)/activate
+    ./kerl install-docsh
+    kerl_deactivate
+    source $(./kerl path install_$_KERL_VSN)/activate
+    erl -noshell -eval 'h(proplists).' -s init stop
+    kerl_deactivate
+  fi
+- ./kerl delete installation $(./kerl path install_$_KERL_VSN)
+- ./kerl delete build "$_KERL_VSN"
diff --git a/kerl b/kerl
index 7baf098..a8a574a 100755
--- a/kerl
+++ b/kerl
@@ -1152,7 +1152,7 @@ install_docsh() {
 
     OTP_VERSION=$(get_otp_version "$1")
     # This has to be updated with docsh updates
-    DOCSH_SUPPORTED='^1[89]\|20$'
+    DOCSH_SUPPORTED='^1[89]\|2[01]$'
     if ! echo "$OTP_VERSION" | grep "$DOCSH_SUPPORTED" >/dev/null 2>&1; then
         echo "Erlang/OTP version $OTP_VERSION not supported by docsh (does not match regex $DOCSH_SUPPORTED)"
         exit 1
-- 
cgit v1.2.3