From 9a93e822390c79f324648b2c7555200025d2212f Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Wed, 20 Aug 2025 22:49:47 +0300 Subject: [PATCH] ci: add a disable_azure_mirror.sh script, and use it before `apt update` to reduce the recent timeouts during installing dependencies (#25147) --- .github/workflows/c2v_ci.yml | 2 ++ .github/workflows/cross_ci.yml | 1 + .github/workflows/disable_azure_mirror.sh | 10 ++++++++++ .github/workflows/gg_regressions_ci.yml | 1 + .github/workflows/module_docs_ci.yml | 2 +- .github/workflows/other_ci.yml | 1 + .github/workflows/puzzle_vibes_ci.yml | 1 + .github/workflows/sanitized_ci.yml | 5 +++++ .github/workflows/sdl_ci.yml | 1 + .github/workflows/v_apps_and_modules_compile_ci.yml | 1 + .github/workflows/vinix_ci.yml | 1 + .github/workflows/vsl_and_vtl_compile_ci.yml | 2 ++ 12 files changed, 27 insertions(+), 1 deletion(-) create mode 100755 .github/workflows/disable_azure_mirror.sh diff --git a/.github/workflows/c2v_ci.yml b/.github/workflows/c2v_ci.yml index 4e8cf1ba7b..8b655030d3 100644 --- a/.github/workflows/c2v_ci.yml +++ b/.github/workflows/c2v_ci.yml @@ -50,6 +50,7 @@ jobs: - name: Install dependencies run: | if [ "${{ runner.os }}" == "Linux" ]; then + .github/workflows/disable_azure_mirror.sh v retry -- sudo apt update -y -qq v retry -- sudo apt install libsdl2-dev libsdl2-mixer-dev libsdl2-net-dev libpng-dev libsamplerate0-dev else @@ -93,6 +94,7 @@ jobs: v -g ~/.vmodules/c2v/ || true - name: Install dependencies run: | + .github/workflows/disable_azure_mirror.sh v retry -- sudo apt update -y -qq v retry -- sudo apt install libsdl2-dev libsdl2-mixer-dev libsdl2-net-dev libpng-dev libsamplerate0-dev # c2v / DOOM dependencies diff --git a/.github/workflows/cross_ci.yml b/.github/workflows/cross_ci.yml index d28709eee3..078640e31f 100644 --- a/.github/workflows/cross_ci.yml +++ b/.github/workflows/cross_ci.yml @@ -65,6 +65,7 @@ jobs: - name: Install dependencies run: | + .github/workflows/disable_azure_mirror.sh ./v retry -- sudo apt update -y -qq ./v retry -- sudo apt install --quiet -y mingw-w64 wine wine64 winetricks libssl-dev sqlite3 libsqlite3-dev diff --git a/.github/workflows/disable_azure_mirror.sh b/.github/workflows/disable_azure_mirror.sh new file mode 100755 index 0000000000..6495995009 --- /dev/null +++ b/.github/workflows/disable_azure_mirror.sh @@ -0,0 +1,10 @@ +#!/bin/bash +echo "APT MIRRORS BEFORE:" +cat /etc/apt/apt-mirrors.txt +sudo sed -i 's@http://azure.archive.ubuntu.com@https://us.archive.ubuntu.com@gm' /etc/apt/apt-mirrors.txt +echo "APT MIRRORS AFTER:" +cat /etc/apt/apt-mirrors.txt + +echo "ls -la /etc/apt/sources.list.d/" +ls -la /etc/apt/sources.list.d/ +for f in /etc/apt/sources.list.d/*; do echo "####### $f ######"; cat $f; done diff --git a/.github/workflows/gg_regressions_ci.yml b/.github/workflows/gg_regressions_ci.yml index 0ea574ff12..f554ceb760 100644 --- a/.github/workflows/gg_regressions_ci.yml +++ b/.github/workflows/gg_regressions_ci.yml @@ -44,6 +44,7 @@ jobs: # libxcursor-dev libxi-dev : V gfx deps # libgl1-mesa-dri : For headless rendering / software DRI driver (LIBGL_ALWAYS_SOFTWARE=true) # freeglut3-dev : Fixes graphic apps compilation with tcc + .github/workflows/disable_azure_mirror.sh ./v retry -- sudo apt update ./v retry -- sudo apt install imagemagick openimageio-tools libgl1-mesa-dri xvfb libxcursor-dev libxi-dev libxrandr-dev freeglut3-dev xsel xclip ./v retry -- ./v download https://raw.githubusercontent.com/tremby/imgur.sh/c98345d/imgur.sh diff --git a/.github/workflows/module_docs_ci.yml b/.github/workflows/module_docs_ci.yml index b1b3d52f0e..26280518a7 100644 --- a/.github/workflows/module_docs_ci.yml +++ b/.github/workflows/module_docs_ci.yml @@ -37,7 +37,7 @@ jobs: - name: Build V run: make -j4 && ./v symlink - name: Update packages, before running apt install - run: v retry -- sudo apt update -y -qq + run: .github/workflows/disable_azure_mirror.sh && v retry -- sudo apt update -y -qq - name: Install dependencies (some modules wrap C libs) run: v retry -- sudo apt install --quiet -y libpq-dev libsodium-dev libasound2-dev libssl-dev \ diff --git a/.github/workflows/other_ci.yml b/.github/workflows/other_ci.yml index fd02ad64a9..f6b6a16850 100644 --- a/.github/workflows/other_ci.yml +++ b/.github/workflows/other_ci.yml @@ -119,6 +119,7 @@ jobs: - name: Install dependencies run: | + .github/workflows/disable_azure_mirror.sh ./v retry -- sudo apt update ./v retry -- sudo apt install --quiet -y libsodium-dev libssl-dev sqlite3 libsqlite3-dev postgresql libpq-dev valgrind ./v retry -- sudo apt install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev libxrandr-dev libasound2-dev xfonts-75dpi xfonts-base diff --git a/.github/workflows/puzzle_vibes_ci.yml b/.github/workflows/puzzle_vibes_ci.yml index e65952fae3..87c010056b 100644 --- a/.github/workflows/puzzle_vibes_ci.yml +++ b/.github/workflows/puzzle_vibes_ci.yml @@ -34,6 +34,7 @@ jobs: - name: Install dependencies run: | + .github/workflows/disable_azure_mirror.sh v retry 'sudo apt update' v retry 'sudo apt install -y libsdl2-dev libsdl2-ttf-dev' v retry 'sudo apt install -y libsdl2-mixer-dev libsdl2-image-dev' diff --git a/.github/workflows/sanitized_ci.yml b/.github/workflows/sanitized_ci.yml index 96ee4f793d..dd467ece5b 100644 --- a/.github/workflows/sanitized_ci.yml +++ b/.github/workflows/sanitized_ci.yml @@ -95,6 +95,7 @@ jobs: run: ./v -silent test-cleancode - name: Install dependencies run: | + .github/workflows/disable_azure_mirror.sh ./v retry -- sudo apt update ./v retry -- sudo apt install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind ./v retry -- sudo apt install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev libxrandr-dev libasound2-dev @@ -124,6 +125,7 @@ jobs: run: ./v -silent test-cleancode - name: Install dependencies run: | + .github/workflows/disable_azure_mirror.sh ./v retry -- sudo apt update ./v retry -- sudo apt install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind ./v retry -- sudo apt install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev libxrandr-dev libasound2-dev @@ -153,6 +155,7 @@ jobs: run: ./v -silent test-cleancode - name: Install dependencies run: | + .github/workflows/disable_azure_mirror.sh ./v retry -- sudo apt update ./v retry -- sudo apt install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind ./v retry -- sudo apt install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev libxrandr-dev libasound2-dev @@ -209,6 +212,7 @@ jobs: run: ./v -silent test-cleancode - name: Install dependencies run: | + .github/workflows/disable_azure_mirror.sh ./v retry -- sudo apt update ./v retry -- sudo apt install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind ./v retry -- sudo apt install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev libxrandr-dev libasound2-dev @@ -239,6 +243,7 @@ jobs: run: ./v -silent test-cleancode - name: Install dependencies run: | + .github/workflows/disable_azure_mirror.sh ./v retry -- sudo apt update ./v retry -- sudo apt install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind ./v retry -- sudo apt install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev libxrandr-dev libasound2-dev diff --git a/.github/workflows/sdl_ci.yml b/.github/workflows/sdl_ci.yml index b44b7b29ef..ef46d07001 100644 --- a/.github/workflows/sdl_ci.yml +++ b/.github/workflows/sdl_ci.yml @@ -36,6 +36,7 @@ jobs: - name: Install dependencies run: | + .github/workflows/disable_azure_mirror.sh v retry 'sudo apt update' v retry 'sudo apt install -y libsdl2-dev libsdl2-ttf-dev' v retry 'sudo apt install -y libsdl2-mixer-dev libsdl2-image-dev' diff --git a/.github/workflows/v_apps_and_modules_compile_ci.yml b/.github/workflows/v_apps_and_modules_compile_ci.yml index 7ada45b0b0..9e4f333014 100644 --- a/.github/workflows/v_apps_and_modules_compile_ci.yml +++ b/.github/workflows/v_apps_and_modules_compile_ci.yml @@ -38,6 +38,7 @@ jobs: - name: Install dependencies run: | if [ "$RUNNER_OS" == 'Linux' ]; then + .github/workflows/disable_azure_mirror.sh v retry -- sudo apt -qq update v retry -- sudo apt -qq install libgc-dev libsodium-dev libssl-dev sqlite3 libsqlite3-dev v retry -- sudo apt -qq install libfreetype6-dev libxi-dev libxcursor-dev libgl-dev libxrandr-dev libasound2-dev xfonts-75dpi xfonts-base diff --git a/.github/workflows/vinix_ci.yml b/.github/workflows/vinix_ci.yml index 1f1f102798..486d801ee7 100644 --- a/.github/workflows/vinix_ci.yml +++ b/.github/workflows/vinix_ci.yml @@ -32,6 +32,7 @@ jobs: - name: Install dependencies run: | + .github/workflows/disable_azure_mirror.sh v retry -- sudo apt update v retry -- sudo apt install build-essential -y diff --git a/.github/workflows/vsl_and_vtl_compile_ci.yml b/.github/workflows/vsl_and_vtl_compile_ci.yml index 8e7d20f55c..08f2504701 100644 --- a/.github/workflows/vsl_and_vtl_compile_ci.yml +++ b/.github/workflows/vsl_and_vtl_compile_ci.yml @@ -38,6 +38,7 @@ jobs: - name: Install dependencies run: | if [ "$RUNNER_OS" == 'Linux' ]; then + .github/workflows/disable_azure_mirror.sh v retry -- sudo apt -qq update v retry -- sudo apt -qq install \ libgc-dev libgl1-mesa-dev mesa-common-dev liblapacke-dev libopenblas-dev libopenmpi-dev \ @@ -72,6 +73,7 @@ jobs: - name: Install dependencies run: | if [ "$RUNNER_OS" == 'Linux' ]; then + .github/workflows/disable_azure_mirror.sh v retry -- sudo apt -qq update v retry -- sudo apt -qq install \ libgc-dev libgl1-mesa-dev mesa-common-dev liblapacke-dev libopenblas-dev libopenmpi-dev