Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

fix(ci): install zsh/fish via apt-get, drop cache-apt-pkgs-action (#3324)

Maximilian Roos16027a6a5899
diff --git a/.github/actions/test-setup/action.yaml b/.github/actions/test-setup/action.yaml
index c097f9ba9..d50770ffe 100644
--- a/.github/actions/test-setup/action.yaml
+++ b/.github/actions/test-setup/action.yaml
@@ -55,10 +55,8 @@ runs:
- name: Install shells (zsh, fish) - Ubuntu
if: runner.os == 'Linux'
- uses: awalsh128/[email protected]
- with:
- packages: zsh fish
- version: 1.0
+ shell: bash
+ run: sudo apt-get update && sudo apt-get install -y zsh fish
- name: Install shells (fish) - macOS
if: runner.os == 'macOS'
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
index 41d903fa7..66174c0e7 100644
--- a/.github/dependabot.yaml
+++ b/.github/dependabot.yaml
@@ -21,11 +21,3 @@ updates:
schedule:
interval: daily
labels: []
- ignore:
- # v1.6.2 normalizes any multi-package list to an empty string and then
- # aborts with "Packages argument is empty" (upstream PR #177 quoted
- # `${packages}` so apt_query treats the whole list as one package name).
- # Tracked at awalsh128/cache-apt-pkgs-action#210. Drop this entry once a
- # fixed release ships so Dependabot can bump forward again.
- - dependency-name: "awalsh128/cache-apt-pkgs-action"
- versions: ["1.6.2"]
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index caee92541..364a6ea73 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -469,10 +469,7 @@ jobs:
save-if: ${{ github.ref == 'refs/heads/main' }}
- name: Install shells (zsh, fish)
- uses: awalsh128/[email protected]
- with:
- packages: zsh fish
- version: 1.0
+ run: sudo apt-get update && sudo apt-get install -y zsh fish
- name: Install nushell
uses: hustcer/setup-nu@v3
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index 2268a99c3..57cc0c65f 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -128,10 +128,7 @@ jobs:
# zsh/fish and probe nushell; match the test matrix's shell setup
# (.github/actions/test-setup) so those combinations run, not just compile.
- name: Install shells (zsh, fish)
- uses: awalsh128/[email protected]
- with:
- packages: zsh fish
- version: 1.0
+ run: sudo apt-get update && sudo apt-get install -y zsh fish
- name: Install nushell
uses: hustcer/setup-nu@v3
@@ -219,10 +216,7 @@ jobs:
save-if: false
- name: Install shells (zsh, fish)
- uses: awalsh128/[email protected]
- with:
- packages: zsh fish
- version: 1.0
+ run: sudo apt-get update && sudo apt-get install -y zsh fish
- name: Install nushell
uses: hustcer/setup-nu@v3