diff --git a/3rdparty/maintui b/3rdparty/maintui index 8c4eb635..8095c0e8 160000 --- a/3rdparty/maintui +++ b/3rdparty/maintui @@ -1 +1 @@ -Subproject commit 8c4eb6350dd55217ffe9c4c1a34c474eebf9c591 +Subproject commit 8095c0e87fd38215e8df66a2a2fe422a2e01eaf2 diff --git a/scripts/gha/deps_linux.sh b/scripts/gha/deps_linux.sh index 141b964f..d60d4770 100755 --- a/scripts/gha/deps_linux.sh +++ b/scripts/gha/deps_linux.sh @@ -59,7 +59,9 @@ regenerate_sources_list() sudo rm /etc/apt/sources.list sudo rm -rf /etc/apt/sources.list.d - for i in focal focal-updates focal-backports focal-security; do + codename=$(grep DISTRIB_CODENAME /etc/lsb-release | cut -d= -f2) + + for i in "$codename" "$codename-updates" "$codename-backports" "$codename-security"; do echo "deb [arch=$GH_CPU_ARCH] http://azure.ports.ubuntu.com/ubuntu-ports $i main universe" | sudo tee -a /etc/apt/sources.list echo "deb [arch=amd64] http://azure.archive.ubuntu.com/ubuntu $i main universe" | sudo tee -a /etc/apt/sources.list done @@ -86,4 +88,4 @@ fi wget "https://github.com/libsdl-org/SDL/releases/download/release-$SDL_VERSION/SDL2-$SDL_VERSION.tar.gz" -qO- | tar -xzf - mv "SDL2-$SDL_VERSION" SDL2_src -rustup target add ${RUST_TARGET[$GH_CPU_ARCH]} +rustup target add "${RUST_TARGET[$GH_CPU_ARCH]}"