From 350e857ac9b065e82d50126a2358b1e476cc5831 Mon Sep 17 00:00:00 2001
From: Derek Stavis <dekestavis@gmail.com>
Date: Wed, 22 Jan 2025 18:19:15 -0800
Subject: [PATCH] chore: update CI to latest OS and Fish versions

---
 .github/workflows/build.yml | 12 ++++++------
 tools/ci-install-fish.sh    |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ffb6ea5..eca9544 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,25 +12,25 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-18.04
           - ubuntu-20.04
+          - ubuntu-22.04
           - ubuntu-latest
         fish:
           - stock
-          - 2
           - 3
+          - 4
           - brew
         exclude:
           - os: ubuntu-20.04
-            fish: 2
+            fish: 4
           - os: ubuntu-latest
-            fish: 2
+            fish: 4
         include:
           - os: macos-latest
             fish: brew
-          - os: macos-11
+          - os: macos-13
             fish: brew
-          - os: macos-12
+          - os: macos-14
             fish: brew
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/tools/ci-install-fish.sh b/tools/ci-install-fish.sh
index ce0cbc5..dc0164a 100755
--- a/tools/ci-install-fish.sh
+++ b/tools/ci-install-fish.sh
@@ -8,8 +8,8 @@ if [[ $FISH_RELEASE = "brew" ]]; then
   brew update
   brew install fish
 else
-  if [[ $FISH_RELEASE == "2" ]]; then
-    REPO_PPA="ppa:fish-shell/release-2"
+  if [[ $FISH_RELEASE == "4" ]]; then
+    REPO_PPA="ppa:fish-shell/beta-4"
   else
     REPO_PPA="ppa:fish-shell/release-3"
   fi