From 8175f6783a13ec9f2f96e4e97e04bdd92c0e2f4d Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 30 Apr 2025 07:55:22 +0900 Subject: [PATCH 1/3] GCC 15 --- .github/workflows/publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 590ed46..f7c4e59 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,6 +21,7 @@ jobs: matrix: # Ruby 3.4 requires BASERUBY 3.0 entry: + - { os: 'noble', tag: 'gcc-15', extras: 'g++-15' } - { os: 'noble', tag: 'gcc-14', extras: 'g++-14' } - { os: 'noble', tag: 'gcc-13', extras: 'g++-13' } - { os: 'jammy', tag: 'gcc-12', extras: 'g++-12' } From 5d14f31045edaedac17b6b14db198d95fcad2ffc Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 30 Apr 2025 08:19:29 +0900 Subject: [PATCH 2/3] Use 25.04 for GCC 15 --- .github/workflows/publish.yml | 2 +- assets/99plucky.list | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 assets/99plucky.list diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f7c4e59..a4dca65 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,7 +21,7 @@ jobs: matrix: # Ruby 3.4 requires BASERUBY 3.0 entry: - - { os: 'noble', tag: 'gcc-15', extras: 'g++-15' } + - { os: 'plucky', tag: 'gcc-15', extras: 'g++-15' } - { os: 'noble', tag: 'gcc-14', extras: 'g++-14' } - { os: 'noble', tag: 'gcc-13', extras: 'g++-13' } - { os: 'jammy', tag: 'gcc-12', extras: 'g++-12' } diff --git a/assets/99plucky.list b/assets/99plucky.list new file mode 100644 index 0000000..e4f5502 --- /dev/null +++ b/assets/99plucky.list @@ -0,0 +1,7 @@ +deb [signed-by=/etc/apt/keyrings/ubuntu-toolchain-r.asc] http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu plucky main +deb [signed-by=/etc/apt/keyrings/ubuntu-toolchain-r.asc] http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu plucky main +deb [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/plucky/ llvm-toolchain-plucky main + +deb-src [signed-by=/etc/apt/keyrings/ubuntu-toolchain-r.asc] http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu plucky main +deb-src [signed-by=/etc/apt/keyrings/ubuntu-toolchain-r.asc] http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu plucky main +deb-src [signed-by=/etc/apt/keyrings/llvm-snapshot.gpg.key.asc] http://apt.llvm.org/plucky/ llvm-toolchain-plucky main From 48bf36043cde2512a7e4ed68ec9dea2f8c8c3088 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 30 Apr 2025 09:21:06 +0900 Subject: [PATCH 3/3] Update the latest version of ubuntu-toolchain-r.asc --- Dockerfile | 2 +- ...C317803A41BA51845E371A1E9377A2BA9EF27F.asc | 14 --------- ...ec952e2a0e1fbdc5090f6a2c277a0a352154e5.asc | 31 +++++++++++++++++++ 3 files changed, 32 insertions(+), 15 deletions(-) delete mode 100644 assets/60C317803A41BA51845E371A1E9377A2BA9EF27F.asc create mode 100644 assets/c8ec952e2a0e1fbdc5090f6a2c277a0a352154e5.asc diff --git a/Dockerfile b/Dockerfile index daeda26..ecb7720 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ ADD assets/99apt.conf /etc/apt/apt.conf.d/ ADD assets/99dpkg.cfg /etc/dpkg/dpkg.cfg.d/ ADD assets/99${version}.list /etc/apt/sources.list.d/ ADD assets/llvm-snapshot.gpg.key /etc/apt/keyrings/llvm-snapshot.gpg.key.asc -ADD assets/60C317803A41BA51845E371A1E9377A2BA9EF27F.asc /etc/apt/keyrings/ubuntu-toolchain-r.asc +ADD assets/c8ec952e2a0e1fbdc5090f6a2c277a0a352154e5.asc /etc/apt/keyrings/ubuntu-toolchain-r.asc ADD assets/3F0F56A8.pub.txt /etc/apt/keyrings/sorah.asc ADD assets/sudoers /etc/sudoers.d/ RUN chmod 0440 /etc/sudoers.d/* diff --git a/assets/60C317803A41BA51845E371A1E9377A2BA9EF27F.asc b/assets/60C317803A41BA51845E371A1E9377A2BA9EF27F.asc deleted file mode 100644 index 4dee5e5..0000000 --- a/assets/60C317803A41BA51845E371A1E9377A2BA9EF27F.asc +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Comment: Hostname: -Version: Hockeypuck 2.1.1-10-gec3b0e7 - -xo0ESuBvRwEEAMi4cDba7xlKaaoXjO1n1HX8RKrkW+HEIl79nSOSJyvzysajs7zU -ow/OzCQp9NswqrDmNuH1+lPTTRNAGtK8r2ouq2rnXT1mTl23dpgHZ9spseR73s4Z -BGw/ag4bpU5dNUStvfmHhIjVCuiSpNn7cyy1JSSvSs3N2mxteKjXLBf7ABEBAAHN -GkxhdW5jaHBhZCBUb29sY2hhaW4gYnVpbGRzwrYEEwECACAFAkrgb0cCGwMGCwkI -BwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAek3eiup7yfzGKA/4xzUqNACSlB+k+DxFF -HqkwKa/ziFiAlkLQyyhm+iqz80htRZr7Ls/ZRYZl0aSU56/hLe0V+TviJ1s8qdN2 -lamkKdXIAFfavA04nOnTzyIBJ82EAUT3Nh45skMxo4z4iZMNmsyaQpNl/m/lNtOL -hR64v5ZybofB2EWkMxUzX8D/FQ== -=xe+/ ------END PGP PUBLIC KEY BLOCK----- diff --git a/assets/c8ec952e2a0e1fbdc5090f6a2c277a0a352154e5.asc b/assets/c8ec952e2a0e1fbdc5090f6a2c277a0a352154e5.asc new file mode 100644 index 0000000..83f2119 --- /dev/null +++ b/assets/c8ec952e2a0e1fbdc5090f6a2c277a0a352154e5.asc @@ -0,0 +1,31 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: Hostname: +Version: Hockeypuck 2.2 + +xsFNBGYzeoEBEADEVzm0fPTo1KfunTjKV5ZP0Mb86Z6izCXSYbeYt/iAaIfK7a8x +c13I/uAOxzjcuZHD4sQh7/22I74ignCSexoJD3PnytpZtAxNjyj3jkJpIrdFOVd4 +Cmua5tnEI1Av+B21YLlYYftK2wR+Z6hpsz3NyQ8URR1SCX04BOV9AGxcWb7izkV9 +RHu6xR4x8kAjuTObhhqw/ZR73+U9mig785qmrtapQkF/IanYj2OofqUJwosDo8YA +shi01735JP9s5do4nnsb6w6xcYQ0HlGn3AxR1k4WA2CK/90QybOmVbLz7IOF3Ou3 +cPfoDzSxAiQemge2msJWPaQLSy/HPUivPB2uNPxkcNIHUVwbjgIig0yaN0EOsveg +o1m6QvS8sm1MEA2ySl+9+q8wdqTnXbSgA3hq/5OoG4rvHD9GUAd6oRxbz/wdOU3J +7BlAhEMAHgeQ9DyIzRP9lGeU3QnWNA+WFiiDrLljf+6xewe5iyqLxPqvCkFUDPCF +emp2oIqeWf6l04IMtM4SJz2AnU1EvytprEEvntMvHMXlBBinw1Q5r3ES/QlPfWr4 +o5CUpu2P3GpZtflDe7jvccyJUMDtlqOVv7wBZPMZykjTAPQ16clGdtIqWdQSk3/b +UA96RSdpM4gMGXFBGLBoAd7CptafRvPjpRnbMxs2jIxicnASfwJALEFgbQARAQAB +zT9MYXVuY2hwYWQgUFBBIGZvciBQUEEgZm9yIFVidW50dSBUb29sY2hhaW4gVXBs +b2FkcyAocmVzdHJpY3RlZCnCwY4EEwEKADgWIQTI7JUuKg4fvcUJD2osJ3oKNSFU +5QUCZjN6gQIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRAsJ3oKNSFU5TkT +EACpFJ+q0xqfAmRF1886cgtVw+ruJTqfsxdj7ms1os3/I5VXLhPMbUg56mtK9Okj +0Nf9rY5bnDagJobjtS2JgzMbYWXocPJuwK6ZvmMD5tFSsTov19R3SyIT2x3JAy7S +/LNWqVeZS41RtM8uSu56PhghE7aAP9PigFTI3CUargpx1DQh6xiHKRR57ZMrLcd4 +l6tj8yb4Hl+OeFRQMcoim696lPMSqzVtJ0epP7yNsz2LFaRmkRP/hf+S4JlSs8uC +wzAl9eJR2h1v1WoBr0pAW2gjjd8VyKWhaKjneicJPqo5GDvhDl+lbrpqSwSHENlH +DVyC+XvAjvTf4JhTQE/M1L/sGrqqa65n+WF4ZqauiDvn1bUw0vnL0oaiK/hyH1YG +XW7khJ7JDlw/6LFNZ6Ih0UuVRTzVBBBz3Sipw5hgM9ztKEYLMI5zlwWGlhEjMnxD +X5WauIUWjPv3dKQp1qTthN7Fgv3/2J6j+2/tMAfWeWB1tL8H4lVPUCfcpQpkTP/E +HTnB3oaRiYy6GDuGKsNkhEUvlV2AnVAxO17IN5QQ2lMQ261zaPj9y9v1oCQlzGfm +UKRJWFGbsooapdm7DTrqrfO+zyRXWPe6GRnYlmeXTRWi8CEIXpCkhhf8rma8KNnW +S96jsTSU97Lo0hnIbL+4o3qf2BiYcfIwfoIXzUaj5ajGEA== +=CwJW +-----END PGP PUBLIC KEY BLOCK-----