Skip to content

ci: use upstream source mirrors and resilient submodule checkout #89

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
pz9115 merged 1 commit into from
Oct 8, 2026
Merged

ci: use upstream source mirrors and resilient submodule checkout #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions .github/workflows/generate-summary.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,10 @@ jobs:
riscv-gnu-toolchain/glibc
riscv-gnu-toolchain/newlib
riscv-gnu-toolchain/qemu
key: ${{ inputs.prefix }}submodules-archive-16 # Numbered archive to allow for easy transition when bumping submodules
key: ${{ inputs.prefix }}submodules-archive-17 # Invalidate cached source URLs after the mirror switch

- name: Synchronize submodule URLs
run: git submodule sync --recursive

- name: Initialize gcc
if: ${{ steps.retrieve-cache.outputs.cache-hit != 'true' }}
Expand All @@ -160,7 +163,7 @@ jobs:
run: |
rm -rf binutils
# Use the mirror since github tends to be pretty reliable for cloning.
git clone https://github.com/bminor/binutils-gdb.git binutils
git clone https://github.com/gnutools/binutils-gdb.git binutils
cd binutils
git checkout ${{ inputs.binutils_branch }}
git pull
Expand All @@ -170,6 +173,7 @@ jobs:
working-directory: ./riscv-gnu-toolchain
run: |
cd binutils
git remote set-url origin https://github.com/gnutools/binutils-gdb.git
git checkout ${{ inputs.binutils_branch }}
git pull

Expand Down Expand Up @@ -736,7 +740,10 @@ jobs:
riscv-gnu-toolchain/glibc
riscv-gnu-toolchain/newlib
riscv-gnu-toolchain/qemu
key: ${{ inputs.prefix }}submodules-archive-16 # Numbered archive to allow for easy transition when bumping submodules
key: ${{ inputs.prefix }}submodules-archive-17 # Invalidate cached source URLs after the mirror switch

- name: Synchronize submodule URLs
run: git submodule sync --recursive

- name: Initialize gcc
if: ${{ steps.retrieve-cache.outputs.cache-hit != 'true' }}
Expand All @@ -760,7 +767,7 @@ jobs:
run: |
rm -rf binutils
# Use the mirror since github tends to be pretty reliable for cloning.
git clone https://github.com/bminor/binutils-gdb.git binutils
git clone https://github.com/gnutools/binutils-gdb.git binutils
cd binutils
git checkout ${{ inputs.binutils_branch }}
git pull
Expand All @@ -770,6 +777,7 @@ jobs:
working-directory: ./riscv-gnu-toolchain
run: |
cd binutils
git remote set-url origin https://github.com/gnutools/binutils-gdb.git
git checkout ${{ inputs.binutils_branch }}
git pull

Expand Down
31 changes: 8 additions & 23 deletions .github/workflows/init-submodules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,32 +56,16 @@ jobs:
riscv-gnu-toolchain/glibc
riscv-gnu-toolchain/newlib
riscv-gnu-toolchain/qemu
key: ${{ inputs.prefix }}submodules-archive-16 # Numbered archive to allow for easy transition when bumping submodules
key: ${{ inputs.prefix }}submodules-archive-17 # Invalidate cached source URLs after the mirror switch

- name: Synchronize submodule URLs
run: git submodule sync --recursive

- name: Initalize submodules cache
id: cache-init
if: steps.retrieve-cache.outputs.cache-hit != 'true'
run: |
git submodule update --init --recursive binutils
git submodule update --init --recursive dejagnu
git submodule update --init --recursive gdb
git submodule update --init --recursive glibc
git submodule update --init --recursive newlib
git submodule update --init --recursive qemu
continue-on-error: true

- name: Initalize submodules cache
if: steps.cache-init.outcome == 'failure'
run: |
echo "Failed to initialize cache submodules. Retrying in 1 min"
sleep 60
git submodule update --init --recursive binutils
git submodule update --init --recursive dejagnu
git submodule update --init --recursive gdb
git submodule update --init --recursive glibc
git submodule update --init --recursive newlib
git submodule update --init --recursive qemu
git submodule update --init --recursive --rebase qemu
bash scripts/update_ci_submodules.sh binutils dejagnu gdb glibc newlib qemu

- name: Initialize gcc
if: steps.retrieve-cache.outputs.cache-hit != 'true'
Expand All @@ -98,7 +82,7 @@ jobs:
run: |
rm -rf binutils
# Use the mirror since github tends to be pretty reliable for cloning.
git clone https://github.com/bminor/binutils-gdb.git binutils
git clone https://github.com/gnutools/binutils-gdb.git binutils
cd binutils
git checkout ${{ inputs.binutils_branch }}
git pull
Expand Down Expand Up @@ -126,6 +110,7 @@ jobs:
# If it's a binutils run, we need to lie about the hash
if [ "${{ inputs.prefix }}" == "binutils_" ]; then
cd ../binutils
git remote set-url origin https://github.com/gnutools/binutils-gdb.git
git checkout ${{ inputs.binutils_branch }}
git pull
export GCCHASH=$(git rev-parse HEAD)
Expand All @@ -146,7 +131,7 @@ jobs:
riscv-gnu-toolchain/glibc
riscv-gnu-toolchain/newlib
riscv-gnu-toolchain/qemu
key: ${{ inputs.prefix }}submodules-archive-16
key: ${{ inputs.prefix }}submodules-archive-17

- name: Make cache zip
run: |
Expand Down
2 changes: 1 addition & 1 deletion riscv-gnu-toolchain
Open in desktop
Submodule riscv-gnu-toolchain updated 5 files
+5 −5 .gitmodules
+18 −0 docs/rise-ci.md
+2 −2 scripts/compare_testsuite_log.py
+30 −0 scripts/update_ci_submodules.sh
+196 −0 test/pytests/test_scripts/test_update_ci_submodules.py
Loading