Bump install-fish action

This commit is contained in:
Raphael Reitzig 2021-01-22 08:41:37 +01:00
parent 244456c681
commit 7b17fcc4b7
3 changed files with 18 additions and 58 deletions

View file

@ -20,6 +20,10 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - 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 - uses: ruby/setup-ruby@v1
with: with:
ruby-version: 2.7 ruby-version: 2.7
@ -36,14 +40,9 @@ jobs:
source "$HOME/.sdkman/bin/sdkman-init.sh" source "$HOME/.sdkman/bin/sdkman-init.sh"
sdk version sdk version
- name: Install fish (Linux) - name: Install fish
if: matrix.os == 'ubuntu-20.04' # TODO: Change to recent version, when the maintainer creates a tag
uses: fish-actions/install-fish@v1.0.0 uses: fish-actions/install-fish@d6d9d26231a15f8d9a6b3e74b3db45512440e3e8
- name: Install fish (macOS)
if: matrix.os == 'macos-latest'
run: |
brew install fish
- name: Install sdkman-for-fish - name: Install sdkman-for-fish
shell: fish "{0}" shell: fish "{0}"
@ -65,10 +64,16 @@ jobs:
confirm-installation: confirm-installation:
name: "Check fisher install" name: "Check fisher install"
runs-on: ubuntu-latest runs-on: ${{ matrix.os }}
strategy:
matrix:
os:
- 'ubuntu-20.04'
- 'macos-latest'
steps: steps:
- name: Install fish - 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! - name: Install SDKMAN!
run: | run: |
@ -84,7 +89,7 @@ jobs:
- name: Install sdkman-for-fish - name: Install sdkman-for-fish
shell: fish "{0}" shell: fish "{0}"
run: | run: |
fisher install reitzig/sdkman-for-fish fisher install reitzig/sdkman-for-fish@${{ github.sha }}
- name: Confirm install - name: Confirm install
shell: fish "{0}" shell: fish "{0}"

View file

@ -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)

View file

@ -10,8 +10,8 @@ Also adds binaries from installed SDKs to the PATH.
Version 2.0.0 has been tested with Version 2.0.0 has been tested with
- fish 3.1, and - fish 3.1.2, and
- SDKMAN! 5.9, on - SDKMAN! 5.9.2, on
- Ubuntu 20.04 LTS and macOS 10.15 - Ubuntu 20.04 LTS and macOS 10.15
## Install ## Install