diff --git a/dogfood/coder/files/etc/apt/sources.list.d/ppa.list b/dogfood/coder/files/etc/apt/sources.list.d/ppa.list index a0d67bd17895a..fbdbef53ea60a 100644 --- a/dogfood/coder/files/etc/apt/sources.list.d/ppa.list +++ b/dogfood/coder/files/etc/apt/sources.list.d/ppa.list @@ -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 diff --git a/dogfood/coder/files/usr/share/keyrings/fish-shell.gpg b/dogfood/coder/files/usr/share/keyrings/fish-shell.gpg index 58ed31417d174..bcaac170cb9d7 100644 Binary files a/dogfood/coder/files/usr/share/keyrings/fish-shell.gpg and b/dogfood/coder/files/usr/share/keyrings/fish-shell.gpg differ diff --git a/dogfood/coder/update-keys.sh b/dogfood/coder/update-keys.sh index 10b2660b5f58b..4d45f348bfcda 100755 --- a/dogfood/coder/update-keys.sh +++ b/dogfood/coder/update-keys.sh @@ -18,7 +18,7 @@ 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 @@ -26,7 +26,7 @@ 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 @@ -50,7 +50,7 @@ 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) @@ -58,7 +58,7 @@ 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 diff --git a/site/src/modules/resources/AgentLogs/mocks.tsx b/site/src/modules/resources/AgentLogs/mocks.tsx index 059e01fdbad64..de08e816614c0 100644 --- a/site/src/modules/resources/AgentLogs/mocks.tsx +++ b/site/src/modules/resources/AgentLogs/mocks.tsx @@ -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", },