Skip to content

Commit aba40df

Browse files
committed
Downgrade to jammy again.
1 parent 88b3909 commit aba40df

File tree

5 files changed

+52
-39
lines changed

5 files changed

+52
-39
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ COMPOSE_PROJECT_NAME='metacall'
2323
# Configure default variables
2424
METACALL_PATH=/usr/local/metacall
2525
METACALL_BUILD_TYPE=relwithdebinfo
26-
METACALL_BASE_IMAGE=debian:trixie-slim # debian:bookworm-slim # ubuntu:mantic # alpine:3.17
26+
METACALL_BASE_IMAGE=debian:trixie-slim # debian:bookworm-slim # ubuntu:jammy # alpine:3.17

.github/workflows/linux-sanitizer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
image: ["debian:trixie-slim", "debian:bookworm-slim", "ubuntu:mantic"]
25+
image: ["debian:trixie-slim", "debian:bookworm-slim", "ubuntu:jammy"]
2626
sanitizer: [address-sanitizer, thread-sanitizer] # TODO: memory-sanitizer not supported by GCC
2727

2828
env:

.github/workflows/linux-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
build: [debug, release]
25-
image: ["debian:trixie-slim", "debian:bookworm-slim", "ubuntu:mantic"] # TODO: "alpine:3.17"
25+
image: ["debian:trixie-slim", "debian:bookworm-slim", "ubuntu:jammy"] # TODO: "alpine:3.17"
2626

2727
steps:
2828
- name: Check out the repository

tools/metacall-environment.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ sub_c(){
585585
echo "configure c"
586586

587587
if [ "${OPERATIVE_SYSTEM}" = "Linux" ]; then
588-
if [ "${LINUX_DISTRO}" = "debian" ] || [ "${LINUX_DISTRO}" = "ubuntu" ]; then
588+
if [ "${LINUX_DISTRO}" = "debian" ]; then
589589
LLVM_VERSION_STRING=11
590590
UBUNTU_CODENAME=""
591591
CODENAME_FROM_ARGUMENTS=""
@@ -621,6 +621,10 @@ sub_c(){
621621
$SUDO_CMD sh -c "echo \"deb-src http://apt.llvm.org/${CODENAME}/ llvm-toolchain${LINKNAME}-${LLVM_VERSION_STRING} main\" >> /etc/apt/sources.list"
622622
$SUDO_CMD apt-get update
623623
$SUDO_CMD apt-get install -y --no-install-recommends libffi-dev libclang-${LLVM_VERSION_STRING}-dev
624+
elif [ "${LINUX_DISTRO}" = "ubuntu" ]; then
625+
# LLVM 11 is available on Ubuntu
626+
LLVM_VERSION_STRING=11
627+
$SUDO_CMD apt-get install -y --no-install-recommends libffi-dev libclang-${LLVM_VERSION_STRING}-dev
624628
elif [ "${LINUX_DISTRO}" = "alpine" ]; then
625629
$SUDO_CMD apk add --no-cache libffi-dev
626630
$SUDO_CMD apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing tcc

tools/metacall-runtime.sh

Lines changed: 44 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -218,41 +218,50 @@ sub_java(){
218218
sub_c(){
219219
echo "configure c"
220220

221-
LLVM_VERSION_STRING=11
222-
UBUNTU_CODENAME=""
223-
CODENAME_FROM_ARGUMENTS=""
224-
225-
# Obtain VERSION_CODENAME and UBUNTU_CODENAME (for Ubuntu and its derivatives)
226-
. /etc/os-release
227-
228-
case ${LINUX_DISTRO} in
229-
debian)
230-
if [ "${VERSION:-}" = "unstable" ] || [ "${VERSION:-}" = "testing" ] || [ "${VERSION_CODENAME}" = "bookworm" ] || [ "${VERSION_CODENAME}" = "trixie" ]; then
231-
# TODO: For now, bookworm || trixie == sid, change when bookworm || trixie is released
232-
CODENAME="unstable"
233-
LINKNAME=""
234-
else
235-
# "stable" Debian release
236-
CODENAME="${VERSION_CODENAME}"
237-
LINKNAME="-${CODENAME}"
238-
fi
239-
;;
240-
*)
241-
# ubuntu and its derivatives
242-
if [ -n "${UBUNTU_CODENAME}" ]; then
243-
CODENAME="${UBUNTU_CODENAME}"
244-
if [ -n "${CODENAME}" ]; then
245-
LINKNAME="-${CODENAME}"
246-
fi
247-
fi
248-
;;
249-
esac
250-
251-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | $SUDO_CMD apt-key add
252-
$SUDO_CMD sh -c "echo \"deb http://apt.llvm.org/${CODENAME}/ llvm-toolchain${LINKNAME}-${LLVM_VERSION_STRING} main\" >> /etc/apt/sources.list"
253-
$SUDO_CMD sh -c "echo \"deb-src http://apt.llvm.org/${CODENAME}/ llvm-toolchain${LINKNAME}-${LLVM_VERSION_STRING} main\" >> /etc/apt/sources.list"
254-
$SUDO_CMD apt-get update
255-
sub_apt_install_hold libffi libclang-${LLVM_VERSION_STRING}
221+
if [ "${OPERATIVE_SYSTEM}" = "Linux" ]; then
222+
LLVM_VERSION_STRING=11
223+
224+
if [ "${LINUX_DISTRO}" = "debian" ]; then
225+
UBUNTU_CODENAME=""
226+
CODENAME_FROM_ARGUMENTS=""
227+
228+
# Obtain VERSION_CODENAME and UBUNTU_CODENAME (for Ubuntu and its derivatives)
229+
. /etc/os-release
230+
231+
case ${LINUX_DISTRO} in
232+
debian)
233+
if [ "${VERSION:-}" = "unstable" ] || [ "${VERSION:-}" = "testing" ] || [ "${VERSION_CODENAME}" = "bookworm" ] || [ "${VERSION_CODENAME}" = "trixie" ]; then
234+
# TODO: For now, bookworm || trixie == sid, change when bookworm || trixie is released
235+
CODENAME="unstable"
236+
LINKNAME=""
237+
else
238+
# "stable" Debian release
239+
CODENAME="${VERSION_CODENAME}"
240+
LINKNAME="-${CODENAME}"
241+
fi
242+
;;
243+
*)
244+
# ubuntu and its derivatives
245+
if [ -n "${UBUNTU_CODENAME}" ]; then
246+
CODENAME="${UBUNTU_CODENAME}"
247+
if [ -n "${CODENAME}" ]; then
248+
LINKNAME="-${CODENAME}"
249+
fi
250+
fi
251+
;;
252+
esac
253+
254+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | $SUDO_CMD apt-key add
255+
$SUDO_CMD sh -c "echo \"deb http://apt.llvm.org/${CODENAME}/ llvm-toolchain${LINKNAME}-${LLVM_VERSION_STRING} main\" >> /etc/apt/sources.list"
256+
$SUDO_CMD sh -c "echo \"deb-src http://apt.llvm.org/${CODENAME}/ llvm-toolchain${LINKNAME}-${LLVM_VERSION_STRING} main\" >> /etc/apt/sources.list"
257+
$SUDO_CMD apt-get update
258+
sub_apt_install_hold libffi libclang-${LLVM_VERSION_STRING}
259+
elif [ "${LINUX_DISTRO}" = "ubuntu" ]; then
260+
# LLVM 11 is available on Ubuntu
261+
LLVM_VERSION_STRING=11
262+
sub_apt_install_hold libffi libclang-${LLVM_VERSION_STRING}
263+
fi
264+
fi
256265
}
257266

258267
# Cobol

0 commit comments

Comments
 (0)