Removed overwriting of the HTTP header file before sending a request.

[mirror_acme.sh.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index d70b7e49dce5bb48258104033892d9cbb0684719..04de19346dce745712ed81a74ffc18d95c2bb5d4 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,54 +1,38 @@
-language: shell\r
-sudo: required\r
-\r
-os:\r
-  - linux\r
-  - osx\r
-\r
-env:\r
-  global:\r
-    - SHFMT_URL=https://github.com/mvdan/sh/releases/download/v0.4.0/shfmt_v0.4.0_linux_amd64\r
-\r
-addons:\r
-  apt:\r
-    sources:\r
-    - debian-sid    # Grab shellcheck from the Debian repo (o_O)\r
-    packages:\r
-    - shellcheck\r
-\r
-install:\r
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then \r
-      brew update && brew install openssl;\r
-      brew info openssl;\r
-      ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/;\r
-      ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/;\r
-      ln -s /usr/local/Cellar/openssl/1.0.2j/bin/openssl /usr/local/openssl;\r
-      _old_path="$PATH";\r
-      echo "PATH=$PATH";\r
-      export PATH="";\r
-      export OPENSSL_BIN="/usr/local/openssl";\r
-      openssl version 2>&1 || true;\r
-      $OPENSSL_BIN version 2>&1 || true;\r
-      export PATH="$_old_path";\r
-    fi\r
-  \r
-script:\r
-  - echo "TEST_LOCAL=$TEST_LOCAL"\r
-  - echo "NGROK_TOKEN=$(echo "$NGROK_TOKEN" | wc -c)"\r
-  - which openssl && openssl version\r
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl -sSL $SHFMT_URL -o ~/shfmt ; fi\r
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then chmod +x ~/shfmt ; fi\r
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ~/shfmt -l -w -i 2 . ; fi\r
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then git diff --exit-code && echo "shfmt OK" ; fi\r
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck -V ; fi\r
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck -e SC2021,SC2126,SC2034 **/*.sh && echo "shellcheck OK" ; fi\r
-  - cd ..\r
-  - git clone https://github.com/Neilpang/acmetest.git && cp -r acme.sh acmetest/ && cd acmetest\r
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo NGROK_TOKEN="$NGROK_TOKEN" ./letest.sh ; fi\r
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo NGROK_TOKEN="$NGROK_TOKEN" OPENSSL_BIN="$OPENSSL_BIN" ./letest.sh ; fi\r
-\r
-\r
-matrix:\r
-  fast_finish: true\r
-  \r
-  \r
+language: shell
+sudo: required
+dist: trusty
+
+os:
+  - linux
+  - osx
+
+services:
+  - docker
+
+env:
+  global:
+    - SHFMT_URL=https://github.com/mvdan/sh/releases/download/v0.4.0/shfmt_v0.4.0_linux_amd64
+
+
+install:
+  - if [ "$TRAVIS_OS_NAME" = 'osx' ]; then
+      brew update && brew install socat;
+      export PATH="/usr/local/opt/openssl@1.1/bin:$PATH" ;
+    fi
+
+script:
+  - echo "NGROK_TOKEN=$(echo "$NGROK_TOKEN" | wc -c)"
+  - command -V openssl && openssl version
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then curl -sSL $SHFMT_URL -o ~/shfmt && chmod +x ~/shfmt && ~/shfmt -l -w -i 2 . ; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then git diff --exit-code && echo "shfmt OK" ; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then shellcheck -V ; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then shellcheck -e SC2181 **/*.sh && echo "shellcheck OK" ; fi
+  - cd ..
+  - git clone https://github.com/Neilpang/acmetest.git && cp -r acme.sh acmetest/ && cd acmetest
+  - if [ "$TRAVIS_OS_NAME" = "linux" -a "$NGROK_TOKEN" ]; then sudo TEST_LOCAL="$TEST_LOCAL" NGROK_TOKEN="$NGROK_TOKEN" ./rundocker.sh testplat ubuntu:latest ; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" -a "$NGROK_TOKEN" ]; then sudo TEST_LOCAL="$TEST_LOCAL" NGROK_TOKEN="$NGROK_TOKEN" ACME_OPENSSL_BIN="$ACME_OPENSSL_BIN" ./letest.sh ; fi
+
+matrix:
+  fast_finish: true
+  
+