From c58cb0f81792a2b6b062ad99d381ee2f25359832 Mon Sep 17 00:00:00 2001 From: Esteban Zimanyi Date: Fri, 10 Jul 2026 17:01:54 +0200 Subject: [PATCH] Harden provision-meos apt steps against mirror stalls The apt-get steps use Acquire::Retries and a 30s Acquire timeout so a slow or stalled Ubuntu mirror fails fast and retries instead of hanging the job. This makes libmeos/catalog provisioning resilient for every binding that consumes the action. --- .github/actions/provision-meos/action.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/provision-meos/action.yml b/.github/actions/provision-meos/action.yml index 64a351d..4e3fc33 100644 --- a/.github/actions/provision-meos/action.yml +++ b/.github/actions/provision-meos/action.yml @@ -50,8 +50,8 @@ runs: - name: Install dev headers for the libclang sysroot shell: bash run: | - sudo apt-get update -qq - sudo apt-get install -y --no-install-recommends \ + sudo apt-get -o Acquire::Retries=3 -o Acquire::http::Timeout=30 -o Acquire::https::Timeout=30 update -qq + sudo apt-get -o Acquire::Retries=3 -o Acquire::http::Timeout=30 -o Acquire::https::Timeout=30 install -y --no-install-recommends \ clang libclang-dev \ libjson-c-dev libgsl-dev libproj-dev libgeos-dev \ postgresql-server-dev-16 @@ -96,14 +96,14 @@ runs: shell: bash run: | sudo service postgresql stop || true - sudo apt-get --purge remove postgresql* -y || true + sudo apt-get -o Acquire::Retries=3 -o Acquire::http::Timeout=30 -o Acquire::https::Timeout=30 --purge remove postgresql* -y || true sudo rm -rf /var/lib/postgresql/ /etc/postgresql/ /var/log/postgresql/ || true - name: Add PostgreSQL APT repository (PGDG) if: inputs.build-libmeos == 'true' shell: bash run: | - sudo apt-get install -y curl ca-certificates gnupg + sudo apt-get -o Acquire::Retries=3 -o Acquire::http::Timeout=30 -o Acquire::https::Timeout=30 install -y curl ca-certificates gnupg curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ \ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' @@ -112,8 +112,8 @@ runs: if: inputs.build-libmeos == 'true' shell: bash run: | - sudo apt-get update - sudo apt-get install -y \ + sudo apt-get -o Acquire::Retries=3 -o Acquire::http::Timeout=30 -o Acquire::https::Timeout=30 update + sudo apt-get -o Acquire::Retries=3 -o Acquire::http::Timeout=30 -o Acquire::https::Timeout=30 install -y \ libgeos-dev libproj-dev libjson-c-dev libgsl-dev \ libh3-dev libgdal-dev libxml2-dev \ autoconf automake libtool pkg-config \