ci: Fix ubuntu build.

odoo · Jan 22, 2025 · 2f21a2b · 2f21a2b
1 parent 271c81b
commit 2f21a2b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/ck b/ck
@@ -100,7 +100,9 @@ if [ "$1" == "tools" -a "$2" == "setup" ]; then
     exit 0
 fi
 
-if is_darwin; then
+if is_ubuntu; then
+    source ./meta/scripts/env-ubuntu.sh
+elif is_darwin; then
     source ./meta/scripts/env-darwin.sh
 fi
 

diff --git a/meta/scripts/env-ubuntu.sh b/meta/scripts/env-ubuntu.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+export PATH=/usr/lib/llvm-19/bin:$PATH
diff --git a/meta/scripts/setup-ubuntu.sh b/meta/scripts/setup-ubuntu.sh
@@ -2,8 +2,6 @@
 
 set -e
 
-export DEBIAN_FRONTEND=noninteractive
-
-apt update
-apt install build-essential git ninja-build libsdl2-dev nasm gcc-multilib qemu-system-x86 mtools liburing-dev ccache jq
-bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" llvm 19
+apt-get update -y --no-install-recommends
+apt-get install -y --no-install-recommends build-essential git ninja-build libsdl2-dev nasm liburing-dev ccache jq
+bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" llvm 19 all
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/usr/bin/env bash

		export PATH=/usr/lib/llvm-19/bin:$PATH