From 1cd5d225fd3ea1899b47838368568fcf9fb0bb6c Mon Sep 17 00:00:00 2001
From: Mark Tiedemann <www.marktiedemann@gmail.com>
Date: Mon, 4 Feb 2019 16:38:45 +0100
Subject: [PATCH] Refactor CI (#39)

---
 .appveyor.yml |  5 +----
 .travis.yml   | 31 +++++++++++++++++--------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index e153ea2..f9fd717 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -12,12 +12,9 @@ for:
   - matrix:
       only:
         - TYPE: powershell
-    install:
-      - ps: iex (new-object net.webclient).downloadstring('https://get.scoop.sh')
-      - ps: scoop install pwsh
     test_script:
       - ps: .\install_test.ps1
-      - ps: pwsh install_test.ps1
+      - pwsh install_test.ps1
 
   - matrix:
       only:
diff --git a/.travis.yml b/.travis.yml
index 1a2556f..f8e94bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,11 +21,11 @@ matrix:
           packages:
             - shellcheck
       env:
+        - SHFMT_VERSION=2.6.2
         - PATH=$HOME/bin/:$PATH
-        - SHFMT_VERSION=v2.6.2
       before_script:
-        - curl -sSL -o "$HOME/bin/shfmt" "https://github.com/mvdan/sh/releases/download/${SHFMT_VERSION}/shfmt_${SHFMT_VERSION}_linux_amd64"
-        - chmod +x "$HOME/bin/shfmt"
+        - curl -sSL -o $HOME/bin/shfmt https://github.com/mvdan/sh/releases/download/v${SHFMT_VERSION}/shfmt_v${SHFMT_VERSION}_linux_amd64
+        - chmod +x $HOME/bin/shfmt
       script:
         - ./install_test.sh
 
@@ -43,24 +43,27 @@ matrix:
     - language: minimal
       os:
         - linux
+      env:
+        - PWSH_VERSION=6.1.2
+        - PATH=$HOME/bin/pwsh:$PATH
       before_script:
-        - wget -q https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb
-        - sudo dpkg -i packages-microsoft-prod.deb
-        - sudo apt-get update
-        - sudo apt-get install -y powershell
+        - mkdir -p $HOME/bin/pwsh
+        - curl -sSL -o $HOME/bin/pwsh/pwsh.tar.gz https://github.com/PowerShell/PowerShell/releases/download/v$PWSH_VERSION/powershell-$PWSH_VERSION-linux-x64.tar.gz
+        - tar -xf $HOME/bin/pwsh/pwsh.tar.gz -C $HOME/bin/pwsh
+        - chmod +x $HOME/bin/pwsh/pwsh
       script:
         - pwsh install_test.ps1
 
     - language: minimal
       os:
         - osx
-      cache:
-        directories:
-          - $HOME/Library/Caches/Homebrew
-      before_cache:
-        - brew cleanup
+      env:
+        - PWSH_VERSION=6.1.2
+        - PATH=$HOME/bin/pwsh:$PATH
       before_script:
-        - brew tap caskroom/cask
-        - brew cask install powershell
+        - mkdir -p $HOME/bin/pwsh
+        - curl -sSL -o $HOME/bin/pwsh/pwsh.tar.gz https://github.com/PowerShell/PowerShell/releases/download/v$PWSH_VERSION/powershell-$PWSH_VERSION-osx-x64.tar.gz
+        - tar -xf $HOME/bin/pwsh/pwsh.tar.gz -C $HOME/bin/pwsh
+        - chmod +x $HOME/bin/pwsh/pwsh
       script:
         - pwsh install_test.ps1