From 7b17fcc4b7e7e9b78ab47453f092dfb34b7f6748 Mon Sep 17 00:00:00 2001
From: Raphael Reitzig <4246780+reitzig@users.noreply.github.com>
Date: Fri, 22 Jan 2021 08:41:37 +0100
Subject: [PATCH] Bump install-fish action

---
 .github/workflows/test.yml | 27 +++++++++++++----------
 .travis.yml                | 45 --------------------------------------
 README.md                  |  4 ++--
 3 files changed, 18 insertions(+), 58 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index dc27012..8ec571b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,6 +20,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      # NB: We have a Docker setup for testing -- why do all this?
+      #     Because we want to confirm it runs on macOS, and
+      #     there are no Docker images based on frickin' macOS.
+
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
@@ -36,14 +40,9 @@ jobs:
           source "$HOME/.sdkman/bin/sdkman-init.sh"
           sdk version
 
-      - name: Install fish (Linux)
-        if: matrix.os == 'ubuntu-20.04'
-        uses: fish-actions/install-fish@v1.0.0
-
-      - name: Install fish (macOS)
-        if: matrix.os == 'macos-latest'
-        run: |
-          brew install fish
+      - name: Install fish
+        # TODO: Change to recent version, when the maintainer creates a tag
+        uses: fish-actions/install-fish@d6d9d26231a15f8d9a6b3e74b3db45512440e3e8
 
       - name: Install sdkman-for-fish
         shell: fish "{0}"
@@ -65,10 +64,16 @@ jobs:
 
   confirm-installation:
     name: "Check fisher install"
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os:
+          - 'ubuntu-20.04'
+          - 'macos-latest'
     steps:
       - name: Install fish
-        uses: fish-actions/install-fish@v1.0.0
+        #uses: fish-actions/install-fish@v1.2.0
+        uses: fish-actions/install-fish@master # TODO: change back after #2
 
       - name: Install SDKMAN!
         run: |
@@ -84,7 +89,7 @@ jobs:
       - name: Install sdkman-for-fish
         shell: fish "{0}"
         run: |
-          fisher install reitzig/sdkman-for-fish
+          fisher install reitzig/sdkman-for-fish@${{ github.sha }}
 
       - name: Confirm install
         shell: fish "{0}"
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index d17c78f..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-matrix:
-  include:
-    - dist: bionic
-      env: FISH=2
-      addons:
-        apt:
-          sources:
-            - sourceline: "ppa:fish-shell/release-2"
-          packages:
-            - fish
-    - dist: bionic
-      env: FISH=3
-      addons:
-        apt:
-          sources:
-            - sourceline: "ppa:fish-shell/release-3"
-          packages:
-            - fish
-    - os: osx
-      env: FISH=3
-      addons:
-        homebrew:
-          packages:
-            - fish # --> latest, i.e. >=3.1.2
-          update: true # TODO: build should be green without, but isn't
-
-before_install:
-  - curl -s "https://get.sdkman.io" | bash
-  - bundle install --gemfile=test/Gemfile --no-cache
-  - |-
-    uname -a;
-    fish --version;
-    { source ~/.bash_profile || source ~/.bashrc; } && sdk version;
-    ruby --version;
-    echo "cucumber $(cucumber --version)";
-
-install:
-  - |-
-    mkdir -p "${HOME}"/.config/fish/{completions,conf.d,functions}
-    cp completions/* "${HOME}"/.config/fish/completions/
-    cp conf.d/* "${HOME}"/.config/fish/conf.d/
-    cp functions/* "${HOME}"/.config/fish/functions/
-
-script:
-  - (cd test && cucumber)
diff --git a/README.md b/README.md
index ecb47bf..cd37c44 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,8 @@ Also adds binaries from installed SDKs to the PATH.
 
 Version 2.0.0 has been tested with 
 
- - fish 3.1, and 
- - SDKMAN! 5.9, on
+ - fish 3.1.2, and 
+ - SDKMAN! 5.9.2, on
  - Ubuntu 20.04 LTS and macOS 10.15
 
 ## Install