Merge pull request #4825 from kinke/gha_simplify_clang_install

kinke · web-flow · commit 9de21fdd8ff0 · 2025-01-18T23:24:14.000+01:00
GHA main: Simplify clang installation via apt.llvm.org repo
diff --git a/.github/actions/1-setup/action.yml b/.github/actions/1-setup/action.yml
@@ -1,7 +1,5 @@
 name: Install prerequisites
 inputs:
-  clang_version:
-    required: true
   llvm_version:
     required: true
   arch:
@@ -22,6 +20,7 @@ runs:
           sudo dpkg --add-architecture i386
         fi
         sudo apt-get -q update
+
         packages=( \
           git-core cmake g++ \
           libcurl4 libxml2-dev libzstd-dev \
@@ -30,43 +29,44 @@ runs:
         if [[ $arch == x86_64 ]]; then
           packages+=(g++-multilib libcurl4:i386)
         fi
+        # extra prerequisites of apt.llvm.org install script
+        packages+=(lsb-release wget software-properties-common gnupg)
+
         sudo -E apt-get -yq install ${packages[@]}
+
         # Make sure to link libzstd statically
         sudo rm /usr/lib/$arch-linux-gnu/libzstd.so
+
         # Install a more recent CMake version in the AArch64 container (for mimalloc...)
         if [[ $arch == aarch64 ]]; then
-          curl -fL --retry 3 --max-time 300 -o cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v3.31.4/cmake-3.31.4-linux-$arch.tar.gz
+          curl -fL --retry 3 --max-time 300 -o cmake.tar.gz \
+            https://github.com/Kitware/CMake/releases/download/v3.31.4/cmake-3.31.4-linux-$arch.tar.gz
           mkdir cmake
           tar -xf cmake.tar.gz --strip 1 -C cmake
           rm cmake.tar.gz
           sudo ln -sf $PWD/cmake/bin/cmake /usr/bin/cmake
         fi
 
-    - name: 'Linux: Download & extract clang' # into ../clang
+    - name: 'Linux: Install clang 19 from apt.llvm.org'
       if: runner.os == 'Linux'
       shell: bash
       run: |
         set -eux
         cd ..
-        arch='${{ inputs.arch }}'
-        extraSuffix=''
-        if [[ $arch == x86_64 ]]; then
-          extraSuffix='-ubuntu-18.04'
-        fi
-        curl -fL --retry 3 --max-time 300 -o clang.tar.xz \
-          https://github.com/llvm/llvm-project/releases/download/llvmorg-${{ inputs.clang_version }}/clang+llvm-${{ inputs.clang_version }}-$arch-linux-gnu$extraSuffix.tar.xz
-        mkdir clang
-        tar -xf clang.tar.xz --strip 1 -C clang
-        rm clang.tar.xz
-        clang/bin/clang --version
-    - name: 'Windows: Install clang'
+        curl -fL --retry 3 --max-time 30 -O https://apt.llvm.org/llvm.sh
+        sudo bash llvm.sh 19
+        for tool in clang clang++ ld.lld; do
+          sudo ln -sf $tool-19 /usr/bin/$tool
+          $tool --version
+        done
+    - name: 'Windows: Install clang v19.1.3 from GitHub'
       if: runner.os == 'Windows'
       shell: bash
       run: |
         set -eux
         cd ..
         curl -fL --retry 3 --max-time 300 -o clang.exe \
-          https://github.com/llvm/llvm-project/releases/download/llvmorg-${{ inputs.clang_version }}/LLVM-${{ inputs.clang_version }}-win64.exe
+          https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.3/LLVM-19.1.3-win64.exe
         ./clang.exe //S # double-slash for bash
         rm clang.exe
         # C:\Program Files\LLVM\bin should already be in PATH
@@ -117,28 +117,16 @@ runs:
 
         llvm/bin/llvm-config --version
 
-    - name: 'Linux: Make lld the default linker'
+    - name: 'Linux: Make lld (from apt.llvm.org) the default linker'
       if: runner.os == 'Linux'
       shell: bash
       run: |
         set -eux
-        sudo ln -sf "$(dirname "$PWD")/llvm/bin/ld.lld" /usr/bin/ld
+        sudo ln -sf ld.lld /usr/bin/ld
         ld --version
 
-    - name: Install ninja
-      if: inputs.arch != 'aarch64'
-      uses: symmetryinvestments/gha-setup-ninja@v2
-    - name: Install ninja (Linux AArch64)
-      if: inputs.arch == 'aarch64'
-      shell: bash
-      run: |
-        set -eux
-        cd ..
-        curl -fL --retry 3 --max-time 60 -O https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-linux-aarch64.zip
-        mkdir ninja
-        unzip ninja-linux-aarch64.zip -d ninja
-        rm ninja-linux-aarch64.zip
-        sudo ln -sf $PWD/ninja/ninja /usr/bin/ninja
+    - name: Install ninja v1.12.1
+      uses: Ahajha/gha-setup-ninja@69595b0cf872acdad8ce599142fbdc88724b9a2b
 
     - name: Install D host compiler
       uses: dlang-community/setup-dlang@v1
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,7 +10,6 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  CLANG_VERSION: 15.0.6
   LLVM_VERSION: 19.1.7
 
 jobs:
@@ -28,8 +27,8 @@ jobs:
             extra_cmake_flags: >-
               -DMULTILIB=ON
               -DBUILD_LTO_LIBS=ON
-              -DCMAKE_C_COMPILER=/home/runner/work/ldc/clang/bin/clang
-              -DCMAKE_CXX_COMPILER=/home/runner/work/ldc/clang/bin/clang++
+              -DCMAKE_C_COMPILER=clang
+              -DCMAKE_CXX_COMPILER=clang++
               -DCMAKE_EXE_LINKER_FLAGS=-static-libstdc++
               -DJITRT_EXTRA_LDFLAGS=-static-libstdc++
               -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto"
@@ -40,15 +39,14 @@ jobs:
             os: ubuntu-22.04-arm # Ubuntu 20 not natively supported
             container_image: ubuntu:20.04
             arch: aarch64
-            clang_version: 15.0.3 # 15.0.6 requires a more recent libstdc++.so.6 than shipped with Ubuntu 20
             bootstrap_cmake_flags: >-
               -DBUILD_LTO_LIBS=ON
               -DCOMPILER_RT_LIBDIR_OS=aarch64-unknown-linux-gnu
             extra_cmake_flags: >-
               -DBUILD_LTO_LIBS=ON
               -DCOMPILER_RT_LIBDIR_OS=aarch64-unknown-linux-gnu
-              -DCMAKE_C_COMPILER=/__w/ldc/clang/bin/clang
-              -DCMAKE_CXX_COMPILER=/__w/ldc/clang/bin/clang++
+              -DCMAKE_C_COMPILER=clang
+              -DCMAKE_CXX_COMPILER=clang++
               -DCMAKE_EXE_LINKER_FLAGS=-static-libstdc++
               -DJITRT_EXTRA_LDFLAGS=-static-libstdc++
               -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto"
@@ -83,7 +81,6 @@ jobs:
           - job_name: Windows x64
             os: windows-2022
             arch: x64
-            clang_version: 19.1.3
             bootstrap_cmake_flags: -DBUILD_LTO_LIBS=ON
             extra_cmake_flags: >-
               -DBUILD_LTO_LIBS=ON
@@ -94,7 +91,6 @@ jobs:
           - job_name: Windows x86
             os: windows-2022
             arch: x86
-            clang_version: 19.1.3
             bootstrap_cmake_flags: -DBUILD_LTO_LIBS=ON
             # `RT_CFLAGS=-m32` needed to make 64-bit clang-cl output 32-bit code for druntime integration tests
             extra_cmake_flags: >-
@@ -126,7 +122,6 @@ jobs:
       - name: Install prerequisites
         uses: ./.github/actions/1-setup
         with:
-          clang_version: ${{ matrix.clang_version || env.CLANG_VERSION }}
           llvm_version: ${{ matrix.llvm_version || env.LLVM_VERSION }}
           arch: ${{ matrix.arch }}
       - name: Build bootstrap LDC
@@ -235,7 +230,6 @@ jobs:
       - name: Install prerequisites
         uses: ./.github/actions/1-setup
         with:
-          clang_version: ${{ env.CLANG_VERSION }}
           llvm_version: ${{ env.LLVM_VERSION }}
           arch: x86_64
       - name: Build bootstrap LDC
