Skip to content

chore: upgrade fish to v4 #17440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 17, 2025
+6 −6
Merged

chore: upgrade fish to v4 #17440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca24c87
chore: upgrade dogfood to fish 4
aslilac Apr 16, 2025
ad5e5dc
🧹
aslilac Apr 16, 2025
cfd1ccc
try again
aslilac Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dogfood/coder/files/etc/apt/sources.list.d/ppa.list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
deb [signed-by=/usr/share/keyrings/ansible.gpg] https://ppa.launchpadcontent.net/ansible/ansible/ubuntu jammy main

deb [signed-by=/usr/share/keyrings/fish-shell.gpg] https://ppa.launchpadcontent.net/fish-shell/release-3/ubuntu/ jammy main
deb [signed-by=/usr/share/keyrings/fish-shell.gpg] https://ppa.launchpadcontent.net/fish-shell/release-4/ubuntu/ jammy main

deb [signed-by=/usr/share/keyrings/git-core.gpg] https://ppa.launchpadcontent.net/git-core/ppa/ubuntu jammy main

Expand Down
Binary file modified dogfood/coder/files/usr/share/keyrings/fish-shell.gpg
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions dogfood/coder/update-keys.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ gpg_flags=(
pushd "$PROJECT_ROOT/dogfood/coder/files/usr/share/keyrings"

# Ansible PPA signing key
curl "${curl_flags[@]}" "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x6125e2a8c77f2818fb7bd15b93c4a3fd7bb9c367" |
curl "${curl_flags[@]}" "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0X6125E2A8C77F2818FB7BD15B93C4A3FD7BB9C367" |
gpg "${gpg_flags[@]}" --output="ansible.gpg"

# Upstream Docker signing key
curl "${curl_flags[@]}" "https://download.docker.com/linux/ubuntu/gpg" |
gpg "${gpg_flags[@]}" --output="docker.gpg"

# Fish signing key
curl "${curl_flags[@]}" "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x59fda1ce1b84b3fad89366c027557f056dc33ca5" |
curl "${curl_flags[@]}" "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x88421E703EDC7AF54967DED473C9FCC9E2BB48DA" |
gpg "${gpg_flags[@]}" --output="fish-shell.gpg"

# Git-Core signing key
Expand All @@ -50,15 +50,15 @@ curl "${curl_flags[@]}" "https://apt.releases.hashicorp.com/gpg" |
gpg "${gpg_flags[@]}" --output="hashicorp.gpg"

# Helix signing key
curl "${curl_flags[@]}" "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x27642b9fd7f1a161fc2524e3355a4fa515d7c855" |
curl "${curl_flags[@]}" "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x27642B9FD7F1A161FC2524E3355A4FA515D7C855" |
gpg "${gpg_flags[@]}" --output="helix.gpg"

# Microsoft repository signing key (Edge)
curl "${curl_flags[@]}" "https://packages.microsoft.com/keys/microsoft.asc" |
gpg "${gpg_flags[@]}" --output="microsoft.gpg"

# Neovim signing key
curl "${curl_flags[@]}" "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x9dbb0be9366964f134855e2255f96fcf8231b6dd" |
curl "${curl_flags[@]}" "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x9DBB0BE9366964F134855E2255F96FCF8231B6DD" |
gpg "${gpg_flags[@]}" --output="neovim.gpg"

# NodeSource signing key
Expand Down
2 changes: 1 addition & 1 deletion site/src/modules/resources/AgentLogs/mocks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ export const MockLogs = [
id: 3295813,
level: "info",
output:
"Hit:16 https://ppa.launchpadcontent.net/fish-shell/release-3/ubuntu jammy InRelease",
"Hit:16 https://ppa.launchpadcontent.net/fish-shell/release-4/ubuntu jammy InRelease",
time: "2024-03-14T11:31:07.827832Z",
sourceId: "d9475581-8a42-4bce-b4d0-e4d2791d5c98",
},
Expand Down
Loading