setup-build-env: use gcc-14 and llvm-20 by default

Author: theihor

setup-build-env/action.yml

@@ -12,7 +12,10 @@ inputs:
   llvm-version:
     description: 'llvm version'
     required: false
-    default: '16'
+    default: '20'
+  gcc-version:
+    required: false
+    default: '14'
   arch:
     description: 'arch'
     required: true
@@ -21,27 +24,27 @@ runs:
   steps:
     - name: Setup environment
       shell: bash
+      env:
+        GCC_VERSION: ${{ inputs.gcc-version }}
       run: |
-        echo "::group::Setup"
-        sudo apt-get update
-        sudo apt-get install -y cmake flex bison build-essential libssl-dev ncurses-dev xz-utils bc rsync libguestfs-tools qemu-kvm qemu-utils zstd libzstd-dev binutils-dev elfutils libcap-dev libelf-dev libdw-dev python3-docutils texinfo libpcap-dev pkg-config
-        echo "::endgroup::"
+        sudo ${GITHUB_ACTION_PATH}/install_packages.sh
     - name: Install clang
       shell: bash
+      env:
+        LLVM_VERSION: ${{ inputs.llvm-version }}
       run: |
-        export LLVM_VERSION=${{ inputs.llvm-version }}
-        ${GITHUB_ACTION_PATH}/install_clang.sh
+        sudo ${GITHUB_ACTION_PATH}/install_clang.sh
     - name: Install pahole
       shell: bash
+      env:
+        PAHOLE_BRANCH: ${{ inputs.pahole }}
+        PAHOLE_ORIGIN: ${{ inputs.pahole-origin }}
       run: |
-        export PAHOLE_BRANCH=${{ inputs.pahole }}
-        export PAHOLE_ORIGIN=${{ inputs.pahole-origin }}
         ${GITHUB_ACTION_PATH}/build_pahole.sh
-    - name: set pahole location
-      shell: bash
-      run: |
         echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-}:/usr/local/lib" >> $GITHUB_ENV
     - name: Install cross compilation toolchain
       shell: bash
+      env:
+        GCC_VERSION: ${{ inputs.gcc-version }}
       run: |
-         ${GITHUB_ACTION_PATH}/install_cross_compilation_toolchain.sh ${{ inputs.arch }}
+         sudo ${GITHUB_ACTION_PATH}/install_cross_compilation_toolchain.sh ${{ inputs.arch }}

setup-build-env/install_clang.sh

@@ -1,34 +1,7 @@
 #!/bin/bash
 set -eu
 
-source $(cd $(dirname $0) && pwd)/../helpers.sh
-
-# Install required packages
-foldable start install_clang "Installing Clang/LLVM"
-sudo apt-get update
-sudo apt-get install -y g++ libelf-dev
-
-if [[ "${LLVM_VERSION}" == $(llvm_latest_version) ]] ; then
-    REPO_DISTRO_SUFFIX=""
-else
-    REPO_DISTRO_SUFFIX="-${LLVM_VERSION}"
-fi
-
-DISTRIB_CODENAME=$(distrib_codename)
-
-echo "deb https://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}${REPO_DISTRO_SUFFIX} main" | sudo tee /etc/apt/sources.list.d/llvm.list
-n=0
-while [ $n -lt 5 ]; do
-  set +e && \
-  wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - && \
-  sudo apt-get update && \
-  sudo apt-get install -y clang-${LLVM_VERSION} lld-${LLVM_VERSION} llvm-${LLVM_VERSION} && \
-  set -e && \
-  break
-  n=$(($n + 1))
-done
-if [ $n -ge 5 ] ; then
-  echo "clang install failed"
-  exit 1
-fi
-foldable end install_clang
+# Assume sudo in this script
+curl -O https://apt.llvm.org/llvm.sh
+chmod +x llvm.sh
+./llvm.sh ${LLVM_VERSION}

setup-build-env/install_cross_compilation_toolchain.sh

@@ -20,6 +20,7 @@ source /etc/os-release
 DEB_ARCH="$(platform_to_deb_arch "${TARGET_ARCH}")"
 DEB_HOST_ARCH="$(dpkg --print-architecture)"
 UBUNTU_CODENAME=${VERSION_CODENAME:-noble}
+GCC_VERSION=${GCC_VERSION:-14}
 
 cat <<EOF | sudo tee /etc/apt/sources.list.d/ubuntu.sources
 Types:        deb
@@ -52,8 +53,8 @@ sudo apt-get update -y
 sudo apt-get install -y                  \
      "crossbuild-essential-${DEB_ARCH}"  \
      "binutils-${TARGET_ARCH}-linux-gnu" \
-     "gcc-${TARGET_ARCH}-linux-gnu"      \
-     "g++-${TARGET_ARCH}-linux-gnu"      \
+     "gcc-${GCC_VERSION}-${TARGET_ARCH}-linux-gnu"      \
+     "g++-${GCC_VERSION}-${TARGET_ARCH}-linux-gnu"      \
      "linux-libc-dev:${DEB_ARCH}"        \
      "libelf-dev:${DEB_ARCH}"            \
      "libssl-dev:${DEB_ARCH}"            \

setup-build-env/install_packages.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -euo pipefail
+
+GCC_VERSION=${GCC_VERSION:-14}
+
+# Assume sudo in this script
+apt-get update -y
+DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
+apt-get install -y \
+    bc binutils-dev bison build-essential cmake curl elfutils flex \
+    libcap-dev libdw-dev libelf-dev libguestfs-tools libpcap-dev \
+    libssl-dev libzstd-dev ncurses-dev pkg-config python3-docutils \
+    qemu-kvm qemu-utils rsync texinfo xz-utils zstd
+
+apt-get install -y gcc-${GCC_VERSION} g++-${GCC_VERSION}
+update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_VERSION} 10
+update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCC_VERSION} 10