From eb8868d8c43a823bbdf019b7f31a2b4d23fb4d9c Mon Sep 17 00:00:00 2001 From: Harry Chen Date: Sun, 28 Apr 2024 00:33:23 +0800 Subject: [PATCH] Add noble in llvm-apt.sh, remove focal from erlang.sh Fix tuna/issues#1948 Signed-off-by: Harry Chen --- erlang.sh | 6 +++--- llvm-apt.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/erlang.sh b/erlang.sh index 6e2d2aa..4a6c02c 100755 --- a/erlang.sh +++ b/erlang.sh @@ -7,7 +7,7 @@ apt_sync="${_here}/apt-sync.py" yum_sync="${_here}/yum-sync.py" BASE_PATH="${TUNASYNC_WORKING_DIR}" -BASE_URL="${TUNASYNC_UPSTREAM_URL}" +BASE_URL=${TUNASYNC_UPSTREAM_URL:-"https://packages.erlang-solutions.com"} CENTOS_PATH="${BASE_PATH}/centos" UBUNTU_PATH="${BASE_PATH}/ubuntu" @@ -15,8 +15,8 @@ DEBIAN_PATH="${BASE_PATH}/debian" export REPO_SIZE_FILE=/tmp/reposize.$RANDOM # generate codenames for repos -ubuntu_os=(focal jammy) -debian_os=(bullseye buster) +ubuntu_os=(jammy) +debian_os=(buster bullseye) deb_suffixes=( mongooseim-5 mongooseim-6 diff --git a/llvm-apt.sh b/llvm-apt.sh index 478bf84..2cc05f6 100755 --- a/llvm-apt.sh +++ b/llvm-apt.sh @@ -10,7 +10,7 @@ BASE_URL=${TUNASYNC_UPSTREAM_URL:-"https://apt.llvm.org"} export REPO_SIZE_FILE=/tmp/reposize.$RANDOM -for os in "focal" "jammy" "buster" "bullseye" "bookworm"; do +for os in "jammy" "noble" "buster" "bullseye" "bookworm"; do prefix=llvm-toolchain-$os "$apt_sync" --delete "$BASE_URL/$os" $prefix,$prefix-9,$prefix-10,$prefix-11,$prefix-12,$prefix-13,$prefix-14,$prefix-15,$prefix-16,$prefix-17,$prefix-18 main amd64,arm64 "$BASE_PATH/$os" done