Skip to content

Commit 88b3909

Browse files
committed
Trying to solve issues in linux environment.
1 parent e06758c commit 88b3909

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
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:noble # ubuntu:mantic # alpine:3.17
26+
METACALL_BASE_IMAGE=debian:trixie-slim # debian:bookworm-slim # ubuntu:mantic # 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:noble", "ubuntu:mantic"]
25+
image: ["debian:trixie-slim", "debian:bookworm-slim", "ubuntu:mantic"]
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:noble", "ubuntu:mantic"] # TODO: "alpine:3.17"
25+
image: ["debian:trixie-slim", "debian:bookworm-slim", "ubuntu:mantic"] # TODO: "alpine:3.17"
2626

2727
steps:
2828
- name: Check out the repository

tools/metacall-environment.sh

Lines changed: 1 addition & 5 deletions
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" ]; then
588+
if [ "${LINUX_DISTRO}" = "debian" ] || [ "${LINUX_DISTRO}" = "ubuntu" ]; then
589589
LLVM_VERSION_STRING=11
590590
UBUNTU_CODENAME=""
591591
CODENAME_FROM_ARGUMENTS=""
@@ -621,10 +621,6 @@ 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
628624
elif [ "${LINUX_DISTRO}" = "alpine" ]; then
629625
$SUDO_CMD apk add --no-cache libffi-dev
630626
$SUDO_CMD apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing tcc

0 commit comments

Comments
 (0)