fix(test): Move local test to more current fish ...

... by means of using a more current OS, and
fix a test helper that used a feature now removed from fish.
This commit is contained in:
Raphael Reitzig 2023-06-26 09:00:24 +02:00
parent a211fbc9d0
commit 7c0ece3dfb
3 changed files with 9 additions and 7 deletions

View file

@ -15,7 +15,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: os:
- 'ubuntu-22.04' - 'ubuntu-latest'
- 'macos-latest' - 'macos-latest'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

View file

@ -1,15 +1,17 @@
FROM ruby:2.7-slim-buster FROM ubuntu
# Install dependencies # Install dependencies
RUN apt-get update \ RUN apt-get update \
&& apt-get -y install \ && apt-get -y install \
fish \ build-essential \
curl \ curl \
fish \
ruby \
ruby-dev \
unzip \ unzip \
zip \ zip \
ruby-dev \ && apt-get clean \
build-essential \ && gem install bundler
&& apt-get clean
WORKDIR app WORKDIR app
COPY test/Gemfile ./ COPY test/Gemfile ./

View file

@ -64,7 +64,7 @@ def run_fish_command(cmd)
end.to_h end.to_h
out, status = Open3.capture2e(<<~FISH out, status = Open3.capture2e(<<~FISH
fish -c '#{cmd} > #{files[:stdout]} ^ #{files[:stderr]}; \ fish -c '#{cmd} > #{files[:stdout]} 2> #{files[:stderr]}; \
echo $status > #{files[:status]}; \ echo $status > #{files[:status]}; \
env > #{files[:env]}; \ env > #{files[:env]}; \
' '