Merge bitcoin/bitcoin#36094: ci: bump riscv toolchain to tag 2026.08.25

607f220c6c Revert "ci: use mirror for riscv submodules" (will)
64af18f4e6 ci: bump riscv toolchain to tag 2026.08.25 (will)

Pull request description:

  This bump includes the new github mirrors for sourceware repos for:

    binutils  https://github.com/gnutools/binutils-gdb.git
    gdb       https://github.com/gnutools/binutils-gdb.git
    glibc     https://github.com/gnutools/glibc.git
    newlib    https://github.com/cygwin/cygwin.git
    musl      https://github.com/kraj/musl.git

  from commit riscv-collab/riscv-gnu-toolchain@92d2391 so that we can remove the fish.foo mirrors.

ACKs for top commit:
  maflcko:
    lgtm ACK 607f220c6c
  sedited:
    ACK 607f220c6c

Tree-SHA512: 627ce75b73e9b8dace6bc883d4e017753d531b083a7ac440a542656c124d5a3dc7827c7390287cb232ebf53416018e2717623d81f92c3518b00cfbff994db1d5
This commit is contained in:
merge-script
2026-08-27 12:36:56 +02:00

View File

@@ -93,18 +93,10 @@ if [[ -n "${USE_INSTRUMENTED_LIBCPP}" ]]; then
fi
if [[ ${BARE_METAL_RISCV} == "true" ]]; then
# Use a mirror for these submodules as sourceware blocks too many requests combating AI.
${CI_RETRY_EXE} git clone --depth=1 https://github.com/riscv-collab/riscv-gnu-toolchain -b 2026.06.06 /riscv/gcc
( cd /riscv/gcc;
export GIT_CONFIG_COUNT=3
export GIT_CONFIG_KEY_0=url.https://git.fish.foo/mirrors/binutils-gdb.git.insteadOf
export GIT_CONFIG_VALUE_0=https://sourceware.org/git/binutils-gdb.git
export GIT_CONFIG_KEY_1=url.https://git.fish.foo/mirrors/glibc.git.insteadOf
export GIT_CONFIG_VALUE_1=https://sourceware.org/git/glibc.git
export GIT_CONFIG_KEY_2=url.https://git.fish.foo/mirrors/newlib-cygwin.git.insteadOf
export GIT_CONFIG_VALUE_2=https://sourceware.org/git/newlib-cygwin.git
./configure --prefix=/opt/riscv-ilp32 --with-arch=rv32gc --with-abi=ilp32 --disable-gdb;
make "$MAKEJOBS"; )
${CI_RETRY_EXE} git clone --depth=1 https://github.com/riscv-collab/riscv-gnu-toolchain -b 2026.08.25 /riscv/gcc
( cd /riscv/gcc
./configure --prefix=/opt/riscv-ilp32 --with-arch=rv32gc --with-abi=ilp32 --disable-gdb
make "$MAKEJOBS" )
rm -rf /riscv/gcc
fi