chore: Update test workflow

- fish-actions/install-fish got a tag
- Ubuntu 22.04 is the latest LTS
- fisher installs differently nowadays
This commit is contained in:
Raphael Reitzig 2023-06-25 10:08:17 +02:00
parent 3f0a0b9a9e
commit e4e94a2653
3 changed files with 10 additions and 13 deletions

View file

@ -15,10 +15,10 @@ jobs:
strategy: strategy:
matrix: matrix:
os: os:
- 'ubuntu-20.04' - 'ubuntu-22.04'
- 'macos-latest' - 'macos-latest'
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
# NB: We have a Docker setup for testing -- why do all this? # NB: We have a Docker setup for testing -- why do all this?
# Because we want to confirm it runs on macOS, and # Because we want to confirm it runs on macOS, and
@ -41,14 +41,14 @@ jobs:
sdk version sdk version
- name: Install fish - name: Install fish
# TODO: Change to recent version, when the maintainer creates a tag uses: fish-actions/install-fish@v1.1.0
uses: fish-actions/install-fish@d6d9d26231a15f8d9a6b3e74b3db45512440e3e8
- name: Install sdkman-for-fish - name: Install sdkman-for-fish
shell: fish "{0}" shell: fish "{0}"
run: | run: |
fish --version fish --version
curl -sL https://git.io/fisher | source && fisher install jorgebucaran/fisher curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source \
&& fisher install jorgebucaran/fisher
fisher install . fisher install .
- name: Confirm install - name: Confirm install
@ -68,12 +68,11 @@ jobs:
strategy: strategy:
matrix: matrix:
os: os:
- 'ubuntu-20.04' - 'ubuntu-22.04'
- 'macos-latest' - 'macos-latest'
steps: steps:
- name: Install fish - name: Install fish
#uses: fish-actions/install-fish@v1.2.0 uses: fish-actions/install-fish@v1.1.0
uses: fish-actions/install-fish@master # TODO: change back after #2
- name: Install SDKMAN! - name: Install SDKMAN!
run: | run: |
@ -83,7 +82,8 @@ jobs:
shell: fish "{0}" shell: fish "{0}"
run: | run: |
fish --version fish --version
curl -sL https://git.io/fisher | source && fisher install jorgebucaran/fisher curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source \
&& fisher install jorgebucaran/fisher
fisher --version fisher --version
- name: Install sdkman-for-fish - name: Install sdkman-for-fish

View file

@ -3,11 +3,8 @@
<deployment type="dockerfile"> <deployment type="dockerfile">
<settings> <settings>
<option name="imageTag" value="sdkman-for-fish-tests" /> <option name="imageTag" value="sdkman-for-fish-tests" />
<option name="buildCliOptions" value="" />
<option name="command" value="" />
<option name="containerName" value="" /> <option name="containerName" value="" />
<option name="contextFolderPath" value="." /> <option name="contextFolderPath" value="." />
<option name="entrypoint" value="" />
<option name="commandLineOptions" value="--rm" /> <option name="commandLineOptions" value="--rm" />
<option name="sourceFilePath" value="test/Dockerfile" /> <option name="sourceFilePath" value="test/Dockerfile" />
</settings> </settings>

View file

@ -19,7 +19,7 @@ Version 2.0.0 has been tested with
With [fisher] (install separately): With [fisher] (install separately):
``` ```
fisher add reitzig/sdkman-for-fish@v2.0.0 fisher install reitzig/sdkman-for-fish@v2.0.0
``` ```
_Note:_ _Note:_