From f010062012d76f3c535751c8ccb2f44c5517b226 Mon Sep 17 00:00:00 2001 From: Mike Wallio Date: Wed, 11 Sep 2024 21:25:56 -0400 Subject: [PATCH 1/2] Add fedora and rhel --- .github/workflows/test.yaml | 2 ++ src/fish/install.sh | 9 +++++++++ test/fish/test.sh | 3 +++ 3 files changed, 14 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 864d27f..b1169c2 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -42,6 +42,7 @@ jobs: - debian:stable-slim - ubuntu:focal - ubuntu:jammy + - fedora:latest steps: - uses: actions/checkout@v4 @@ -86,6 +87,7 @@ jobs: - debian:stable-slim - ubuntu:focal - ubuntu:jammy + - fedora:latest steps: - uses: actions/checkout@v4 diff --git a/src/fish/install.sh b/src/fish/install.sh index 4c218fa..ac4dc70 100644 --- a/src/fish/install.sh +++ b/src/fish/install.sh @@ -53,6 +53,9 @@ apt_get_update() { apt-get update -y fi ;; + fedora|rhel) + dnf update -y + ;; esac } @@ -70,6 +73,9 @@ check_packages() { apk add --no-cache "$@" fi ;; + fedora|rhel) + dnf install -y --setopt=install_weak_deps=False "$@" + ;; esac } @@ -106,6 +112,9 @@ case "${ID}" in alpine) apk add --no-cache fish ;; + fedora|rhel) + dnf install -y --setopt=install_weak_deps=False fish + ;; esac fish -v diff --git a/test/fish/test.sh b/test/fish/test.sh index 82fc61b..f76dffa 100755 --- a/test/fish/test.sh +++ b/test/fish/test.sh @@ -17,6 +17,9 @@ case "${ID}" in alpine) check "fish" fish -v ;; + fedora|rhel) + check "fish" fish -v + ;; esac check "fisher" fish -c "fisher -v" From 3b8e803e07948d5c3dc56db18c3444706206eeef Mon Sep 17 00:00:00 2001 From: Mike Wallio Date: Thu, 12 Sep 2024 08:19:22 -0400 Subject: [PATCH 2/2] Bump minor version --- src/fish/devcontainer-feature.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fish/devcontainer-feature.json b/src/fish/devcontainer-feature.json index 3fb6f79..15a366a 100644 --- a/src/fish/devcontainer-feature.json +++ b/src/fish/devcontainer-feature.json @@ -1,7 +1,7 @@ { "name": "fish", "id": "fish", - "version": "1.2.2", + "version": "1.3.0", "description": "Installs fish shell and Fisher plugin manager (optionally)", "documentationURL": "https://github.com/meaningful-ooo/devcontainer-features/tree/main/src/fish", "options": {