Skip to content

Commit

Permalink
Merge pull request #241 from justinmayer/check-fish-version
Browse files Browse the repository at this point in the history
  • Loading branch information
justinmayer committed Mar 7, 2024
2 parents d280414 + b4a4510 commit a47d51b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7]
python-version: ["3.9"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install Fish
Expand All @@ -42,7 +42,7 @@ jobs:
- name: Check for release
if: github.ref == 'refs/heads/main'
run: |
python -m pip install githubrelease httpx==0.16.1 autopub
python -m pip install githubrelease httpx==0.18.2 autopub
echo "##[set-output name=release;]$(autopub check)"
id: check_release
- name: Deploy
Expand Down
3 changes: 3 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Release type: patch

Improve resiliency of `check_fish_version()` function to invisible characters such as tabs.
2 changes: 1 addition & 1 deletion virtualfish/loader/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def check_fish_version():
import subprocess
from packaging import version

cmd = ["fish", "-c", "echo $version"]
cmd = ["fish", "-N", "-c", "echo $version"]
fish_version = subprocess.check_output(cmd).decode("utf-8").strip()
# Remove any extraneous hyphen-suffixed bits
fish_version = fish_version.partition("-")[0]
Expand Down

0 comments on commit a47d51b

Please sign in to comment.