From ca24c87e707fdd283b6c6796fb575552e1e0a33f Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Wed, 16 Apr 2025 23:06:17 +0000 Subject: [PATCH 1/3] chore: upgrade dogfood to fish 4 --- dogfood/coder/files/etc/apt/sources.list.d/ppa.list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From ad5e5dc45eb24d54f16115c9de974b2e093af920 Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Wed, 16 Apr 2025 23:19:52 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=A7=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coder/files/usr/share/keyrings/fish-shell.gpg | Bin 371 -> 0 bytes dogfood/coder/update-keys.sh | 8 ++++---- site/src/modules/resources/AgentLogs/mocks.tsx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dogfood/coder/files/usr/share/keyrings/fish-shell.gpg b/dogfood/coder/files/usr/share/keyrings/fish-shell.gpg index 58ed31417d174aa9af164185a087044442ff9de0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 GIT binary patch literal 0 HcmV?d00001 literal 371 zcmV-(0gV2}jRaB@HlYCo0I^imuEf@EC7SG5Us&{JOvi~Jq2S6_4t`8Yim4!)MoUQW0AY4IOR6TIeubeTC`N9`^%%*ui(92d&Y06o=zRSG zEu0ObJTtM-Uv`iOG^@0|YnIQc2)@Hy!bZS49GICtXVVGPgQP{00GS?Oks6y zV`y+;WFSybK_F&tav(-&b7&xQXk~0{AZ=l3ZggR3Ze?y7>PL} z)`;!)Y%C*iYH`*R+)TdSNrSwYvNA)VtlDyDBy7BV5$y;&Ujmd=`KJMt^Jc$W^uqCwyGULbHXcyS^i>AHHuYNG$;&v R69qdjViXA|p;^rN_OJ1#m;?X- 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", }, From cfd1ccc7c16b65d8038304ce14a62f2424651cc2 Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Thu, 17 Apr 2025 16:50:47 +0000 Subject: [PATCH 3/3] try again --- .../files/usr/share/keyrings/fish-shell.gpg | Bin 0 -> 1163 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dogfood/coder/files/usr/share/keyrings/fish-shell.gpg b/dogfood/coder/files/usr/share/keyrings/fish-shell.gpg index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..bcaac170cb9d7fd284af9280110ba00cedba818d 100644 GIT binary patch literal 1163 zcmV;61a$kx!A%5aG>gFj5CFULu!NsR+w~r$gA}8{OzV9?ir95uQiPu>B8VUFyL`J z*GIfwxzX?9`j>k@cctHVS)^x-&~&`zCewEcs9WF7`SqBZ?oJc8SWc25D8l}<1>lOV zH7;jx4ZbwD+wJ=grG+MZpp&`A3feDr^?W~b0^g`ky7EK|e4d6*B?{;r1Te3{y}!$0 z(|bh4#jbU&=vmo07EJrwxMm=TYpo7_Z?RrDW>cc&pLSJxcw7%knI5J~K#W!!61}XV zY--8@7IwqT6LK)lfqv-_svea;bu)E%u{e;d&(;_9gkgb`C z?V0tqlpi-K#L%vNzOM1@L0(mPxcwx`uPW&|m~QiuF<>xyDnF>pm0GMt z;GbizmAQi8;*F-#y@mS=`(^Q0VZf>^?3}YVPtxF67GbSm0TENP zTx}N~xy~ZmO;w&;panfZy77}9grJ+(Ezrhge56Z;MrQgf@Wi^YRUj+}@YyGOmZyd6 zD;^gfJT_EZIcWe90RREbC`@5>ZewV0VPqgsP(dJOZ*m|;X>({Gb7*C3Y#?o6X>N33 zX>Mh5bHc%n1QP)Y05}#Q1c*W&a6a66^+{*m)N{%F$>O_6+64k;G>gFk8v_Lk2?z%Q z1{Dek2nzxP76JnS0v-VZ7k~f?2@rG1{K?|GNZJWd5C3j+k_xwCx6bXpz~*X+J^Dm8 zVTy}if|anWNZAE!Dil{dmiNgV5Ja#m5lB<>C^?Y;NN94M4iF?C)6o@|f{J~)$N6e5 z`01Z3C5BQxei_J^Eww7353|Itt-Xt``(Hq>wC`bX<+2hOo~o3CRMz>4&;kXfiX&yK zop55}Ln*a}OrPv^IF^CklO+mYNWx7o9Q02qMzHC@(c~zN=@FV$TK2Wh$&Z1B(ft%c zw~W=}`EXxlq6%gK1ZP*DaQ2z-J~-FJ#&`pMI&)kEJPw~`-LS|4Yh`GpV;!$mD5rG7 z-ise%Seo8;l}soS`XW{T4APnku4B#l`+O0jjHUyTOUtcAoYkGt@!~OZXX;fB-83g& zfo@v5F(!s(sZX8aAIZ#kw(Ji*HTwtx)Of@+SMjo^PIt=sEiVfJ3!;XMtDwb9;B6^s z?Pa1oM%Z1K<8QJVq}hsI+pm8hX!5%^iN~{MMJARxb|-Gzg(4JX4R+!drt2g(2g4s- zM_jfglnO(gx_Xqj7l&({o+y#ia8(Cmnexhh{V$bEXQm~=iT$Z<75uy3oo$JlwbN8s z#D(=J5^WiBPZS2Fr`re8Y6QsGrIhosAUAUb?E$$GBE$heKMnSv2M8kyltmxKRC#KQ djX4mr*&_$}FA2-X8lNCpSf(~yW15heviZNRC^!HB literal 0 HcmV?d00001