Make CI pass again (+ crashpad update)

.github/workflows/ci-workflow.yml

@@ -12,17 +12,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cfg: # some jobs disabled because we have too many
-          - { os: ubuntu-22.04, apt: g++-8,    cxx: g++-8,      cc: gcc-8,    dist: false, archstr: "x64"}
-          #- { os: ubuntu-22.04, apt: g++-9,    cxx: g++-9,      cc: gcc-9,    dist: false, archstr: "x64"}
-          - { os: ubuntu-22.04, apt: g++-10,   cxx: g++-10,     cc: gcc-10,   dist: false, archstr: "x64"}
-          - { os: ubuntu-22.04, apt: g++-13,   cxx: g++-13,     cc: gcc-13,   dist: false, archstr: "x64"}
-          - { os: ubuntu-22.04, apt: clang-9,  cxx: clang++-9,  cc: clang-9,  dist: false, archstr: "x64"}
-          #- { os: ubuntu-22.04, apt: clang-10, cxx: clang++-10, cc: clang-10, dist: false, archstr: "x64"}
-          #- { os: ubuntu-22.04, apt: clang-11, cxx: clang++-11, cc: clang-11, dist: false, archstr: "x64"}
-          - { os: ubuntu-22.04, apt: clang-12, cxx: clang++-12, cc: clang-12, dist: true, archstr: "x64"}
-          - { os: ubuntu-22.04, apt: clang-16, cxx: clang++-16, cc: clang-16, dist: false, archstr: "x64"}
-          - { os: ubuntu-22.04-arm, apt: clang-16, cxx: clang++-16, cc: clang-16, dist: false, archstr: "aarch64"}
+        cfg:
+          - { os: ubuntu-24.04, apt: g++-11,   cxx: g++-11,     cc: gcc-11,   dist: false, archstr: "x64"}
+          - { os: ubuntu-24.04, apt: g++-12,   cxx: g++-12,     cc: gcc-12,   dist: false, archstr: "x64"}
+          - { os: ubuntu-24.04, apt: g++-13,   cxx: g++-13,     cc: gcc-13,   dist: false, archstr: "x64"}
+          - { os: ubuntu-24.04, apt: g++-14,   cxx: g++-14,     cc: gcc-14,   dist: false, archstr: "x64"}
+          - { os: ubuntu-24.04, apt: clang-16, cxx: clang++-16, cc: clang-16, dist: true, archstr: "x64"}
+          - { os: ubuntu-24.04, apt: clang-17, cxx: clang++-17, cc: clang-17, dist: false, archstr: "x64"}
+          - { os: ubuntu-24.04, apt: clang-18, cxx: clang++-18, cc: clang-18, dist: false, archstr: "x64"}
+          - { os: ubuntu-24.04-arm, apt: clang-16, cxx: clang++-16, cc: clang-16, dist: false, archstr: "aarch64"}
 
     steps:
       - name: Checkout Etterna
@@ -36,14 +34,24 @@ jobs:
           repository: etternagame/CrashpadTools
           path: tools
 
+      - name: Setup Crashpad
+        shell: bash
+        run: |
+          git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git "$HOME/depot_tools"
+
+          cd main/extern/crashpad
+          "$HOME/depot_tools/gclient" sync
+          "$HOME/depot_tools/gclient" runhooks
+
       - name: Install apt packages
-        run: sudo apt update && sudo apt install ${{ matrix.cfg.cpp-version }} nasm ninja-build libglew-dev libxrandr-dev libxtst-dev libpulse-dev libasound-dev libogg-dev libvorbis-dev xorg-dev libcurl4-openssl-dev
+        run: sudo apt update && sudo apt install ${{ matrix.cfg.apt }} nasm ninja-build libglew-dev libxrandr-dev libxtst-dev libpulse-dev libasound-dev libogg-dev libvorbis-dev xorg-dev libcurl4-openssl-dev
       - name: Install OpenSSL 3.5
         run: mkdir -p tmp/openssl && cd tmp/openssl && wget https://github.com/openssl/openssl/releases/download/openssl-3.5.1/openssl-3.5.1.tar.gz && tar -xf openssl-3.5.1.tar.gz && cd openssl-3.5.1 && ./Configure --prefix="${HOME}/toolchain" && make -j `nproc` && make test -j `nproc` && sudo make install
       - name: Generate CMake
         run: mkdir main/build && cd main/build && cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTS=FALSE -DBUILD_EXAMPLES=FALSE -DOPENSSL_ROOT_DIR=~/toolchain/ ..
         env:
-          CXX: ${{matrix.cfg.cpp-version}}
+          CXX: ${{matrix.cfg.cxx}}
+          CC: ${{matrix.cfg.cc}}
 
       - name: Build Project
         run: cd main/build && ninja
@@ -56,7 +64,7 @@ jobs:
         if: ${{matrix.cfg.dist}}
         uses: actions/upload-artifact@v4
         with:
-          name: "Etterna - Linux x64"
+          name: "Etterna - Linux ${{matrix.cfg.archstr}}"
           path: '${{github.workspace}}/main/build/*.tar.gz'
 
       - name: Update Environment Variables
@@ -82,7 +90,7 @@ jobs:
         if: ${{matrix.cfg.dist}}
         uses: actions/upload-artifact@v4
         with:
-          name: Etterna Symbols Linux x64 - ${{github.sha}}
+          name: Etterna Symbols Linux ${{matrix.cfg.archstr}} - ${{github.sha}}
           path: '${{github.workspace}}/sym/EtternaSymbolsUploadDir'
 
       - name: Get version for CrashServer Upload
@@ -123,8 +131,17 @@ jobs:
           repository: etternagame/CrashpadTools
           path: tools
 
+      - name: Setup Crashpad
+        shell: bash
+        run: |
+          git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git "$HOME/depot_tools"
+
+          cd main/extern/crashpad
+          "$HOME/depot_tools/gclient" sync
+          "$HOME/depot_tools/gclient" runhooks
+
       - name: Install homebrew packages
-        run: brew install cmake nasm ninja openssl
+        run: brew install cmake nasm yasm ninja openssl
 
       - name: Setup Python 3
         uses: actions/setup-python@v6
@@ -207,7 +224,7 @@ jobs:
           #- { os: macos-13,     name: "Ventura", dist: true} # rendered useless by GHA
           #- { os: macos-12,     name: "Monterey", dist: true} # rendered useless by GHA
           #- { os: macos-11,     name: "Big Sur",  dist: true} # rendered useless by GHA
-          - { os: macos-15,     name: "Sequoia", dist: true}
+          - { os: macos-15-intel,     name: "Sequoia", dist: true}
 
     steps:
 
@@ -222,13 +239,17 @@ jobs:
           repository: etternagame/CrashpadTools
           path: tools
 
-      - name: Install homebrew packages
-        run: brew install cmake nasm ninja openssl
+      - name: Setup Crashpad
+        shell: bash
+        run: |
+          git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git "$HOME/depot_tools"
 
-      - name: Setup Python 2.7
-        uses: MatteoH2O1999/setup-python@v6
-        with:
-          python-version: '2.7'
+          cd main/extern/crashpad
+          "$HOME/depot_tools/gclient" sync
+          "$HOME/depot_tools/gclient" runhooks
+
+      - name: Install homebrew packages
+        run: brew install cmake nasm yasm ninja openssl
 
       - name: Setup Python 3
         uses: actions/setup-python@v6
@@ -325,6 +346,15 @@ jobs:
           repository: etternagame/CrashpadTools
           path: tools
 
+      - name: Setup Crashpad
+        shell: bash
+        run: |
+          git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git "$HOME/depot_tools"
+
+          cd main/extern/crashpad
+          "$HOME/depot_tools/gclient" sync
+          "$HOME/depot_tools/gclient" runhooks
+
       - name: Install homebrew packages
         run: brew install cmake nasm ninja openssl && brew tap etternagame/etterna && brew update && HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
 
@@ -392,12 +422,12 @@ jobs:
         if: ${{ matrix.cfg.dist && github.event_name == 'release' && github.event.action == 'published' }}
         with:
           files: ${{github.workspace}}/main/build/*.dmg
-  windows: # Windows x64 and x86 build matrix
+  windows: # Windows x64 (RIP x86) build matrix
     strategy:
       fail-fast: false # Don't cancel other matrix jobs if one fails
       matrix:
         cfg:
-        - { name: i386, arch: x86,  ssl-dir: 'C:\Program Files (x86)\OpenSSL-Win32' }
+        #- { name: i386, arch: x86,  ssl-dir: 'C:\Program Files (x86)\OpenSSL-Win32' }
         - { name: x64,  arch: x64,  ssl-dir: 'C:\Program Files\OpenSSL-Win64'}
 
     name: "Windows ${{matrix.cfg.name}}"
@@ -414,6 +444,15 @@ jobs:
           repository: etternagame/CrashpadTools
           path: tools
 
+      - name: Setup Crashpad
+        shell: bash
+        run: |
+          git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git "$HOME/depot_tools"
+
+          cd main/extern/crashpad
+          "$HOME/depot_tools/gclient" sync
+          "$HOME/depot_tools/gclient" runhooks
+
       - name: Checkout DirectX SDK
         uses: actions/checkout@v3
         with:
@@ -430,24 +469,6 @@ jobs:
         with:
           python-version: '3.12'
 
-      - name: Setup Python 2.7
-        uses: MatteoH2O1999/setup-python@v6
-        with:
-          python-version: '2.7'
-
-      - name: Install chocolatey packages (i386)
-        if: ${{ matrix.cfg.arch == 'x86' }}
-        run: choco install ninja nsis -y --x86
-
-      # the last win32 curl version is 8.15.0
-      - name: Install curl (i386)
-        if: ${{ matrix.cfg.arch == 'x86' }}
-        run: choco install curl -y --x86 --version=8.15.0
-
-      - name: Install openSSL (i386)
-        if: ${{ matrix.cfg.arch == 'x86' }}
-        run: choco install openssl -y --x86
-
       - name: Install chocolatey packages (x64)
         if: ${{ matrix.cfg.arch == 'x64' }}
         run: choco install ninja nsis curl -y

CMake/Helpers/CMakeLinux.cmake

@@ -27,4 +27,4 @@ target_link_libraries(Etterna PRIVATE ${PULSEAUDIO_LIBRARIES})
 target_link_libraries(Etterna PRIVATE ${ALSA_LIBRARIES})
 target_link_libraries(Etterna PRIVATE ${JACK_LIBRARIES})
 target_link_libraries(Etterna PRIVATE ${VA_LIBRARIES})
-target_link_libraries(Etterna PRIVATE ${OPENGL_LIBRARY})
+target_link_libraries(Etterna PRIVATE ${OPENGL_LIBRARY})

CMake/Helpers/CMakeMacOS.cmake

@@ -36,11 +36,15 @@ find_library(MAC_FRAME_CARBON Carbon)
 find_library(MAC_FRAME_COREAUDIO CoreAudio)
 find_library(MAC_FRAME_IOKIT IOKit)
 find_library(MAC_FRAME_METAL Metal)
+find_library(MAC_FRAME_FOUNDATION Foundation)
+find_library(MAC_FRAME_APPKIT AppKit)
 target_link_libraries(Etterna PRIVATE ${MAC_FRAME_AUDIOUNIT})
 target_link_libraries(Etterna PRIVATE ${MAC_FRAME_CARBON})
 target_link_libraries(Etterna PRIVATE ${MAC_FRAME_COREAUDIO})
 target_link_libraries(Etterna PRIVATE ${MAC_FRAME_IOKIT})
 target_link_libraries(Etterna PRIVATE ${MAC_FRAME_METAL})
+target_link_libraries(Etterna PRIVATE ${MAC_FRAME_FOUNDATION})
+target_link_libraries(Etterna PRIVATE ${MAC_FRAME_APPKIT})
 
 # Extern Libraries
 target_link_libraries(Etterna PRIVATE ffmpeg)

CMake/Helpers/CPackSetup.cmake

@@ -10,6 +10,12 @@ set(INSTALL_DIR "Etterna" CACHE STRING "Output directory for built game")
 set(ASSET_DIR "${INSTALL_DIR}" CACHE STRING "Output directory for game assets")
 
 if(UNIX)
+    set_target_properties(Etterna PROPERTIES
+        INSTALL_RPATH "\$ORIGIN:\$ORIGIN/../lib"
+        INSTALL_RPATH_USE_LINK_PATH TRUE
+        SKIP_INSTALL_RPATH OFF
+    )
+
     set(CPACK_GENERATOR TGZ)
     set(CPACK_DEBIAN_PACKAGE_DEPENDS "")
     set(CPACK_PACKAGE_CONTACT https://github.com/etternagame/etterna)
@@ -23,6 +29,10 @@ if(UNIX)
                             GROUP_READ GROUP_EXECUTE
                             WORLD_READ WORLD_EXECUTE)
     endif()
+
+    install(FILES "${PROJECT_SOURCE_DIR}/extern/discord/lib/release/libdiscord_partner_sdk.so"
+        COMPONENT Etterna
+        DESTINATION ${INSTALL_DIR})
 endif()
 
 # Windows Specific CPack

CMakeLists.txt

@@ -43,6 +43,16 @@ add_executable(Etterna)
 # Project Compile Options
 set(WITH_CRASHPAD TRUE CACHE BOOL "Compile with Crash Handler (Requires depot_tools installed)")
 
+# Discord doesn't seem to provide Linux arm64 binaries...
+set(SUPPORT_DISCORD_SDK ON)
+if(UNIX AND NOT APPLE)
+    string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" _proc)
+    if(_proc MATCHES "^(arm64|aarch64)$")
+        message(WARNING "Discord Social SDK not supported for this platform")
+        set(SUPPORT_DISCORD_SDK OFF)
+    endif()
+endif()
+
 ## Setting Target Properties
 ### Set a different name for each output binary depending on what build configuration is.
 ### Usually it is separated by directory, but since we have the same directory for every
@@ -100,7 +110,12 @@ target_link_libraries(Etterna PRIVATE rapidjson)
 target_link_libraries(Etterna PRIVATE jwt-cpp)
 target_link_libraries(Etterna PRIVATE websocketpp)
 target_link_libraries(Etterna PRIVATE libluajit)
-target_link_libraries(Etterna PRIVATE discord)
+
+if(SUPPORT_DISCORD_SDK)
+    add_compile_definitions(SUPPORT_DISCORD_SDK)
+    target_link_libraries(Etterna PRIVATE discord)
+endif()
+
 target_link_libraries(Etterna PRIVATE muFFT)
 target_link_libraries(Etterna PRIVATE glfw)
 target_link_libraries(Etterna PRIVATE ogg)
@@ -115,7 +130,8 @@ target_link_libraries(Etterna PRIVATE plog::plog)
 target_link_libraries(Etterna PRIVATE nowide::nowide)
 target_link_libraries(Etterna PRIVATE ghc_filesystem)
 
-if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
+string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" _proc)
+if(_proc MATCHES "^(arm64|aarch64)$")
   target_link_libraries(Etterna PRIVATE sse2neon)
 endif()
 

Docs/Building.md

@@ -110,6 +110,13 @@ There are two stages apart of CMake projects.
 
 ### CLI Project Generation
 
+Before starting, if you really need Crashpad, be sure to sync its dependencies:
+```bash
+cd extern/crashpad
+gclient sync
+gclient runhooks
+```
+
 Both configuration and generation stages automatically happen one after the other when using the CLI.
 Start by creating a folder to hold all the output object files, usually called `build`, within the root of the project.
 

extern/CMakeLists.txt

@@ -33,10 +33,12 @@ target_include_directories(websocketpp INTERFACE websocketpp)
 target_link_libraries(websocketpp INTERFACE asio)
 
 ## discord-rpc
-set(CLANG_FORMAT_CMD OFF CACHE BOOL "" FORCE)   # Disable discord clang-format
-set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)     # Disable discord examples
-add_subdirectory(discord)
-
+if(SUPPORT_DISCORD_SDK)
+    set(CLANG_FORMAT_CMD OFF CACHE BOOL "" FORCE)   # Disable discord clang-format
+    set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)     # Disable discord examples
+    add_subdirectory(discord)
+    list(APPEND EXT_TARGETS discord)
+endif()
 ## plog
 set(PLOG_BUILD_SAMPLES OFF)
 add_subdirectory(plog)
@@ -48,12 +50,12 @@ add_subdirectory(rapidjson)
 add_subdirectory(stb)
 add_subdirectory(miniz)
 
-if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
+string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" _proc)
+if(_proc MATCHES "^(arm64|aarch64)$")
     # Used for providing ARM's NEON equivalents of x86_64 SSE SIMD instructions
     add_subdirectory(sse2neon)
 endif()
 
-
 set(JWT_SSL_LIBRARY OpenSSL)
 add_subdirectory(jwt-cpp-0.6.0)
 
@@ -85,7 +87,7 @@ endif()
 ## IDE Folder Organization
 list(APPEND EXT_TARGETS
     SQLiteCpp sqlite3
-    discord muFFT
+    muFFT
     zlib libmad pcre
     ogg vorbis glfw
     fmt)

extern/crashpad/.gclient

@@ -1,9 +1,7 @@
-target_os = ["mac", "win", "unix"];
 solutions = [
   {
-    "custom_vars": { "pull_linux_clang": True },
     "name": "crashpad",
     "url": "https://chromium.googlesource.com/crashpad/crashpad.git",
     "managed": False,
   },
-];
+]

extern/crashpad/.gclient_entries

@@ -1,15 +1,14 @@
 entries = {
   'crashpad': 'https://chromium.googlesource.com/crashpad/crashpad.git',
-  'buildtools': 'https://chromium.googlesource.com/chromium/src/buildtools.git@9e121212d42be62a7cce38072f925f8398d11e49',
-  'crashpad/third_party/googletest/googletest': 'https://chromium.googlesource.com/external/github.com/google/googletest@11da093e0477185dbd78abaaa9f99db15be498d0',
+  'buildtools': 'https://chromium.googlesource.com/chromium/src/buildtools.git@efa920ce144e4dc1c1841e73179cd7e23b9f0d5e',
+  'buildtools/clang_format/script': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@c912837e0d82b5ca4b6e790b573b3956d3744c1c',
+  'buildtools/win:gn/gn/windows-amd64': 'https://chrome-infra-packages.appspot.com/gn/gn/windows-amd64@git_revision:5e19d2fb166fbd4f6f32147fbb2f497091a54ad8',
+  'crashpad/third_party/googletest/googletest': 'https://chromium.googlesource.com/external/github.com/google/googletest@3983f67e32fb3e9294487b9d4f9586efa6e5d088',
   'crashpad/third_party/libfuzzer/src': 'https://chromium.googlesource.com/chromium/llvm-project/compiler-rt/lib/fuzzer.git@fda403cf93ecb8792cb1d061564d89a6553ca020',
-  'crashpad/third_party/linux/clang/linux-amd64:fuchsia/clang/linux-amd64': 'https://chrome-infra-packages.appspot.com/fuchsia/clang/linux-amd64@goma',
-  'crashpad/third_party/lss/lss': 'https://chromium.googlesource.com/linux-syscall-support.git@7bde79cc274d06451bf65ae82c012a5d3e476b5a',
-  'crashpad/third_party/mini_chromium/mini_chromium': 'https://chromium.googlesource.com/chromium/mini_chromium@14b219d5d503e305a6d853e64de201659cfcbe2d',
-  'crashpad/third_party/zlib/zlib': 'https://chromium.googlesource.com/chromium/src/third_party/zlib@13dc246a58e4b72104d35f9b1809af95221ebda7',
-  'buildtools/clang_format/script': 'https://chromium.googlesource.com/chromium/llvm-project/cfe/tools/clang-format.git@96636aa0e9f047f17447f2d45a094d0b59ed7917',
-  'buildtools/mac:gn/gn/mac-amd64': 'https://chrome-infra-packages.appspot.com/gn/gn/mac-amd64@git_revision:3028c6a426a4aaf6da91c4ebafe716ae370225fe',
-  'buildtools/third_party/libc++/trunk': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@d9040c75cfea5928c804ab7c235fed06a63f743a',
-  'buildtools/third_party/libc++abi/trunk': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@196ba1aaa8ac285d94f4ea8d9836390a45360533',
-  'buildtools/third_party/libunwind/trunk': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@d999d54f4bca789543a2eb6c995af2d9b5a1f3ed',
+  'crashpad/third_party/lss/lss': 'https://chromium.googlesource.com/linux-syscall-support.git@9719c1e1e676814c456b55f5f070eabad6709d31',
+  'crashpad/third_party/mini_chromium/mini_chromium': 'https://chromium.googlesource.com/chromium/mini_chromium@706fce5b1a280a6f2eea69040f67847f9acb65ff',
+  'crashpad/third_party/ninja:infra/3pp/tools/ninja/${platform}': 'https://chrome-infra-packages.appspot.com/infra/3pp/tools/ninja/${platform}@version:2@1.8.2.chromium.3',
+  'crashpad/third_party/windows/clang/win-amd64:Win/clang-llvmorg-20-init-17108-g29ed6000-2.tar.xz': 'gs://chromium-browser-clang/Win/clang-llvmorg-20-init-17108-g29ed6000-2.tar.xz',
+  'crashpad/third_party/zlib/zlib': 'https://chromium.googlesource.com/chromium/src/third_party/zlib@fef58692c1d7bec94c4ed3d030a45a1832a9615d',
+  'buildtools/win/format:49458d4c1e884a38308f8dc6a2c7eb55fc478755': 'gs://chromium-clang-format/49458d4c1e884a38308f8dc6a2c7eb55fc478755',
 }

extern/crashpad/.gclient_previous_sync_commits

@@ -0,0 +1 @@
+{}