git: Updated CI to latest available compilers and distros (#2003)

2025-01-10 21:41:53 +01:00 · 2024-12-13 00:07:46 +01:00 · 2024-12-13 00:07:46 +01:00 · 093310a9e5
commit 093310a9e5
parent 21b315b97e
14 changed files with 63 additions and 67 deletions
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@ -8,7 +8,7 @@ on:
 jobs:
  codeql:
    name: 🐛 CodeQL
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
    permissions:
      actions: read
      contents: read
@ -49,7 +49,7 @@ jobs:
        set -x
        mkdir -p build
        cd build
-        CC=gcc-12 CXX=g++-12 cmake              \
+        CC=gcc-14 CXX=g++-14 cmake              \
          -DCMAKE_BUILD_TYPE=$BUILD_TYPE        \
          -DCMAKE_INSTALL_PREFIX="$PWD/install" \
          -DCMAKE_C_COMPILER_LAUNCHER=ccache    \
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -255,14 +255,15 @@ jobs:
        set -x
        mkdir -p build
        cd build
-        CC=$(brew --prefix gcc@12)/bin/gcc-12                                                       \
-        CXX=$(brew --prefix gcc@12)/bin/g++-12                                                      \
+        CC=$(brew --prefix llvm)/bin/clang                                                          \
+        CXX=$(brew --prefix llvm)/bin/clang++                                                       \
        OBJC=$(brew --prefix llvm)/bin/clang                                                        \
        OBJCXX=$(brew --prefix llvm)/bin/clang++                                                    \
        PKG_CONFIG_PATH="$(brew --prefix openssl)/lib/pkgconfig":"$(brew --prefix)/lib/pkgconfig"   \
        cmake -G "Ninja"                                                                            \
          -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}                                                  \
          -DIMHEX_GENERATE_PACKAGE=ON                                                               \
+          -DIMHEX_SYSTEM_LIBRARY_PATH="$(brew --prefix llvm)/lib;$(brew --prefix llvm)/lib/unwind;$(brew --prefix llvm)/lib/c++;$(brew --prefix)/lib" \
          -DCMAKE_C_COMPILER_LAUNCHER=ccache                                                        \
          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache                                                      \
          -DCMAKE_OBJC_COMPILER_LAUNCHER=ccache                                                     \
@ -314,7 +315,7 @@ jobs:
        path: ./*.dmg

  macos-arm64-build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
    name: 🍎 macOS 13 arm64
    outputs:
      IMHEX_VERSION: ${{ steps.build.outputs.IMHEX_VERSION }}
@ -403,7 +404,13 @@ jobs:
          cd bundle
          ln -s /Applications Applications
          cd ..
-          hdiutil create -volname "ImHex" -srcfolder bundle -ov -format UDZO imhex-${{ env.IMHEX_VERSION }}-macOS-arm64.dmg
+          for i in $(seq 1 10); do
+              if hdiutil create -volname "ImHex" -srcfolder bundle -ov -format UDZO imhex-${{ env.IMHEX_VERSION }}-macOS-arm64.dmg; then
+                  echo "Created dmg after ${i} attempts"
+                  break
+              fi
+              sleep 10
+          done

      - name: ⬆️ Upload DMG
        uses: actions/upload-artifact@v4
@ -418,11 +425,11 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - release_num: 22.04
-          - release_num: 24.04
+          - release_num: "24.04"
+          - release_num: "24.10"

    name: 🐧 Ubuntu ${{ matrix.release_num }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04

    container:
      image: "ubuntu:${{ matrix.release_num }}"
@ -462,7 +469,7 @@ jobs:
          git config --global --add safe.directory '*'
          mkdir -p build
          cd build
-          CC=gcc-12 CXX=g++-12 cmake -G "Ninja"                       \
+          CC=gcc-14 CXX=g++-14 cmake -G "Ninja"                       \
            -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}                  \
            -DCMAKE_INSTALL_PREFIX="/usr"                             \
            -DCMAKE_C_COMPILER_LAUNCHER=ccache                        \
@ -497,7 +504,7 @@ jobs:

  # AppImage build
  appimage:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
    name: ⬇️ AppImage
    steps:
      - name: 🧰 Checkout
@ -541,7 +548,7 @@ jobs:
  # ArchLinux build
  archlinux-build:
    name: 🐧 ArchLinux
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04

    container:
      image: archlinux:base-devel
@ -647,21 +654,21 @@ jobs:
            mock_release: rawhide
            release_num: rawhide
            mock_config: fedora-rawhide
+          - name: Fedora
+            mock_release: f41
+            release_num: 41
+            mock_config: fedora-41
          - name: Fedora
            mock_release: f40
            release_num: 40
            mock_config: fedora-40
-          - name: Fedora
-            mock_release: f39
-            release_num: 39
-            mock_config: fedora-39
          - name: RHEL-AlmaLinux
            mock_release: epel9
            release_num: 9
            mock_config: "alma+epel-9"

    name: 🐧 ${{ matrix.name }} ${{ matrix.release_num }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04

    container:
      image: "almalinux:9"
--- a/.github/workflows/build_web.yml
+++ b/.github/workflows/build_web.yml
@ -20,7 +20,7 @@ permissions:
 jobs:

  build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
    name: 🌍 WebAssembly
    steps:
    - name: 🧰 Checkout
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@ -15,7 +15,7 @@ on:
 jobs:
  tests:
    name: 🧪 Unit Tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
    permissions:
      actions: read
      contents: read
@ -38,14 +38,13 @@ jobs:
      run: |
        sudo apt update
        sudo bash dist/get_deps_debian.sh
-        sudo apt install gcovr -y

    - name: 🛠️ Build
      run: |
        set -x
        mkdir -p build
        cd build
-        CC=gcc-12 CXX=g++-12 cmake                                                                                 \
+        CC=gcc-14 CXX=g++-14 cmake                                                                                 \
          -DCMAKE_BUILD_TYPE=Debug                                                                                 \
          -DIMHEX_ENABLE_UNIT_TESTS=ON                                                                             \
          -DIMHEX_ENABLE_PLUGIN_TESTS=ON                                                                           \
@ -70,7 +69,11 @@ jobs:
    # Generate report from all gcov .gcda files
    - name: 🧪 Generate coverage report
      run: |
-        gcovr --gcov-executable /usr/bin/gcov-12 -r . build --xml coverage_report.xml --verbose
+        sudo apt install python3-pip python3-venv
+        python3 -m venv venv
+        . venv/bin/activate
+        pip3 install gcovr
+        gcovr --gcov-executable /usr/bin/gcov-14 -e ".+yara_rules.+" -r . build --xml coverage_report.xml --verbose

    - name: Upload coverage reports to Codecov
      env:
--- a/cmake/build_helpers.cmake
+++ b/cmake/build_helpers.cmake
@ -240,6 +240,7 @@ macro(createPackage)

    if (APPLE)
        if (IMHEX_GENERATE_PACKAGE)
+            set(EXTRA_BUNDLE_LIBRARY_PATHS ${EXTRA_BUNDLE_LIBRARY_PATHS} "${IMHEX_SYSTEM_LIBRARY_PATH}")
            include(PostprocessBundle)

            set_target_properties(libimhex PROPERTIES SOVERSION ${IMHEX_VERSION})
--- a/dist/AppImageBuilder.yml
+++ b/dist/AppImageBuilder.yml
@ -14,17 +14,17 @@ AppDir:
    - amd64
    allow_unauthenticated: true
    sources:
-    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ jammy main restricted
-    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ jammy-updates main restricted
-    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ jammy universe
-    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ jammy-updates universe
-    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ jammy multiverse
-    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ jammy-updates multiverse
-    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ jammy-backports main restricted
+    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ oracular main restricted
+    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ oracular-updates main restricted
+    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ oracular universe
+    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ oracular-updates universe
+    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ oracular multiverse
+    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ oracular-updates multiverse
+    - sourceline: deb http://us.archive.ubuntu.com/ubuntu/ oracular-backports main restricted
        universe multiverse
-    - sourceline: deb http://security.ubuntu.com/ubuntu jammy-security main restricted
-    - sourceline: deb http://security.ubuntu.com/ubuntu jammy-security universe
-    - sourceline: deb http://security.ubuntu.com/ubuntu jammy-security multiverse
+    - sourceline: deb http://security.ubuntu.com/ubuntu oracular-security main restricted
+    - sourceline: deb http://security.ubuntu.com/ubuntu oracular-security universe
+    - sourceline: deb http://security.ubuntu.com/ubuntu oracular-security multiverse
    include:
    - librsvg2-common
    - libbz2-1.0:amd64
--- a/dist/Brewfile
+++ b/dist/Brewfile
@ -6,7 +6,6 @@ brew "freetype2"
 brew "libmagic"
 brew "pkg-config"
 brew "curl"
-brew "gcc@12"
 brew "llvm"
 brew "glfw"
 brew "ninja"
--- a/dist/appimage/Dockerfile
+++ b/dist/appimage/Dockerfile
@ -1,4 +1,4 @@
-FROM ubuntu:22.04 as build
+FROM ubuntu:24.10 as build

 # Used to invalidate layer cache but not mount cache
 # See https://github.com/moby/moby/issues/41715#issuecomment-733976493
@ -14,24 +14,13 @@ apt update
 # general deps
 apt install -y ccache git wget
 # appimage tools deps
-apt install -y python3-pip python3-setuptools desktop-file-utils libgdk-pixbuf2.0-dev fuse ninja-build
+apt install -y python3-pip python3-venv python3-setuptools desktop-file-utils libgdk-pixbuf2.0-dev fuse ninja-build
 apt install -y squashfs-tools zsync

 # imhex deps
 /tmp/get_deps_debian.sh
 EOF

-RUN --mount=type=cache,target=/cache <<EOF
-# Download appimage-builder
-set -xe
-
-mkdir -p /cache/bin
-wget -nc https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O /cache/bin/appimagetool || true
-chmod +x /cache/bin/appimagetool
-
-pip3 install git+https://github.com/AppImageCrafters/appimage-builder@f38699e
-EOF
-
 ENV PATH="/cache/bin/:${PATH}"

 # Copy Imhex source
@ -47,7 +36,7 @@ RUN <<EOF
 # Prepare ImHex build
 set -xe

-CC=gcc-12 CXX=g++-12 cmake -G "Ninja"                  \
+CC=gcc-14 CXX=g++-14 cmake -G "Ninja"                  \
    -DCMAKE_BUILD_TYPE=${BUILD_TYPE}                   \
    -DCMAKE_INSTALL_PREFIX="/usr"                      \
    -DCMAKE_C_COMPILER_LAUNCHER=ccache                 \
@ -71,9 +60,18 @@ ccache -s
 EOF

 RUN <<EOF
-# Package ImHex as AppImage
+# Download appimage-builder
 set -xe

+mkdir -p /cache/bin
+wget -nc https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O /cache/bin/appimagetool || true
+chmod +x /cache/bin/appimagetool
+
+python3 -m venv venv
+. venv/bin/activate
+pip3 install git+https://github.com/AppImageCrafters/appimage-builder@f38699e
+
+# Package ImHex as AppImage
 export VERSION=$(cat /imhex/VERSION)
 appimage-builder --recipe /imhex/dist/AppImageBuilder.yml
 EOF
--- a/dist/get_deps_debian.sh
+++ b/dist/get_deps_debian.sh
@ -8,8 +8,8 @@ fi

 apt install -y \
  build-essential       \
-  gcc-12                \
-  g++-12                \
+  gcc-14                \
+  g++-14                \
  lld                   \
  ${PKGCONF:-}          \
  cmake                 \
--- a/dist/get_deps_tumbleweed.sh
+++ b/dist/get_deps_tumbleweed.sh
@ -3,8 +3,8 @@
 zypper install     \
  cmake            \
  ninja            \
-  gcc12            \
-  gcc12-c++        \
+  gcc14            \
+  gcc14-c++        \
  fontconfig-devel \
  freetype2-devel  \
  libcurl-devel    \
--- a/dist/macOS/arm64.Dockerfile
+++ b/dist/macOS/arm64.Dockerfile
@ -118,7 +118,7 @@ if [ "$CUSTOM_GLFW" ]; then
    cd /mnt/glfw
    mkdir build
    cd build
-    CC=o64-gcc CXX=o64-g++ cmake -G "Ninja"             \
+    CC=o64-clang CXX=o64-clang++ cmake -G "Ninja"       \
          -DCMAKE_BUILD_TYPE=$BUILD_TYPE                \
          -DBUILD_SHARED_LIBS=ON                        \
          -DCMAKE_C_COMPILER_LAUNCHER=ccache            \
--- a/dist/macOS/arm64.crosscompile.Dockerfile
+++ b/dist/macOS/arm64.crosscompile.Dockerfile
@ -68,19 +68,6 @@ RUN --mount=type=cache,target=/cache <<EOF
    
    ccache -s
 EOF
-# Not needed, because we don't use gcc for cross-compiling anymore
-# ## Install dependencies for gcc-13
-# RUN apt install -y gcc g++ zlib1g-dev libmpc-dev libmpfr-dev libgmp-dev
-# ## Build cross-compiler gcc-13
-# RUN --mount=type=cache,target=/cache <<EOF
-#     set -xe
-#     ccache -zs
-
-#     cd /osxcross
-#     UNATTENDED=1 CC=/usr/lib/ccache/gcc CXX=/usr/lib/ccache/g++ GCC_VERSION=13.2.0 ./build_gcc.sh
-
-#     ccache -s
-# EOF

 ARG DELETE_SDK=1
 RUN <<EOF
--- a/plugins/disassembler/CMakeLists.txt
+++ b/plugins/disassembler/CMakeLists.txt
@ -6,6 +6,7 @@ if (NOT USE_SYSTEM_CAPSTONE)
    set(CAPSTONE_BUILD_STATIC_RUNTIME OFF CACHE BOOL "Disable shared library building")
    set(CAPSTONE_BUILD_SHARED OFF CACHE BOOL "Disable shared library building")
    set(CAPSTONE_BUILD_TESTS OFF CACHE BOOL "Disable tests")
+    set(CAPSTONE_BUILD_MACOS_THIN ON CACHE BOOL "Enable thin builds of capstone for macOS" FORCE)
    add_subdirectory(${THIRD_PARTY_LIBS_FOLDER}/capstone ${CMAKE_CURRENT_BINARY_DIR}/capstone EXCLUDE_FROM_ALL)
    target_compile_options(capstone PRIVATE -Wno-unused-function)
    set(CAPSTONE_LIBRARY "capstone")
--- a/plugins/script_loader/CMakeLists.txt
+++ b/plugins/script_loader/CMakeLists.txt
@ -19,7 +19,7 @@ if (CoreClrEmbed_FOUND)
            BUILD_RPATH         ${CoreClrEmbed_FOLDER}
            INSTALL_RPATH       ${CoreClrEmbed_FOLDER})

-    set(EXTRA_BUNDLE_LIBRARY_PATHS "${CoreClrEmbed_FOLDER}" PARENT_SCOPE)
+    set(EXTRA_BUNDLE_LIBRARY_PATHS ${EXTRA_BUNDLE_LIBRARY_PATHS} "${CoreClrEmbed_FOLDER}" PARENT_SCOPE)

    if (IMHEX_BUNDLE_DOTNET)
        install(FILES ${CoreClrEmbed_SHARED_LIBRARIES} DESTINATION ${CMAKE_INSTALL_LIBDIR})