Update GitHub workflow configuration

Author: dr8co

.github/workflows/cmake-multi-platform.yml

@@ -27,14 +27,6 @@ jobs:
               LD_LIBRARY_PATH: "/usr/local/opt/llvm/lib"
               DYLD_LIBRARY_PATH: "/usr/local/opt/llvm/lib"
 
-#          - os: macos-latest
-#            c_compiler: gcc
-#            cpp_compiler: g++-13
-#
-#          - os: ubuntu-latest
-#            c_compiler: gcc
-#            cpp_compiler: g++-13
-
           - os: ubuntu-latest
             c_compiler: clang
             cpp_compiler: clang++-18
@@ -51,22 +43,11 @@ jobs:
         run: |
           export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE
           brew update
-          brew install llvm cmake ninja gcc libgcrypt openssl@3 readline libsodium
+          brew install llvm cmake ninja gcc@13 libgcrypt openssl@3 readline libsodium
           echo 'export PATH="/usr/local/opt/llvm/bin:$PATH"' >> ~/.bash_profile
           echo 'export PATH="/usr/local/opt/gcc@13/bin:$PATH"' >> ~/.bash_profile
           echo 'export PATH="/usr/local/opt/gcc@13/lib/gcc/13:$PATH"' >> ~/.bash_profile      
 
-      #      - name: Install Dependencies
-#        if: matrix.os == 'ubuntu-latest'
-#        run: |
-#          wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
-#          sudo add-apt-repository -y "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main"
-#          sudo add-apt-repository -y ppa:ubuntu-toolchain-r/ppa
-#          sudo apt update
-#          sudo apt install -y cmake ninja-build gcc-13 g++-13 clang-17 lldb-17 lld-17 libc++-17-dev libc++abi-17-dev \
-#          libomp-17-dev libgcrypt20 openssl libreadline8 libsodium23 libsodium-dev
-
-
       - uses: actions/checkout@v4
 
       - name: Set reusable strings
@@ -80,19 +61,11 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
         run: |
           sudo ./scripts/buildscript.sh
-      #          OS=${{ matrix.os }}
-      #          COMMAND="./scripts/install-blake3.sh ${{ matrix.c_compiler }}"
-      #          if [ "$OS" == "macos-latest" ]; then
-      #            $COMMAND
-      #          elif [ "$OS" == "ubuntu-latest" ]; then
-      #            sudo $COMMAND
-      #          fi
-      #
 
       - name: Install Blake3
         if: matrix.os == 'macos-latest'
         run: |
-          ./scripts/install-blake3.sh ${{ matrix.c_compiler }}
+          sudo ./scripts/install-blake3.sh ${{ matrix.c_compiler }}
 
       - name: Configure CMake
         if: matrix.os == 'macos-latest'
@@ -112,12 +85,7 @@ jobs:
       - name: Build
         if: matrix.os == 'macos-latest'
         run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }} -j 4
-#
-#      - name: Test
-#        working-directory: ${{ steps.strings.outputs.build-output-dir }}
-#        # Execute tests defined by the CMake configuration
-#        run: ctest --build-config ${{ matrix.build_type }}
-#
+
       - name: Package
         if: matrix.os == 'macos-latest' && matrix.build_type == 'Release'
         working-directory: ${{ steps.strings.outputs.build-output-dir }}

scripts/buildscript.sh

@@ -29,7 +29,7 @@ function install_dependencies() {
   add-apt-repository -y "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main"
   add-apt-repository -y ppa:ubuntu-toolchain-r/ppa
   apt update
-  apt install -y unzip gcc clang-18 lldb-18 lld-18 libc++-18-dev libc++abi-18-dev clang-tools-18 libgcrypt20 openssl libreadline8 libsodium23 libsodium-dev
+  apt install -y unzip gcc-14 clang-18 lldb-18 lld-18 libc++-18-dev libc++abi-18-dev libllvmlibc-18-dev clang-tools-18 libgcrypt20 openssl libreadline8 libsodium23 libsodium-dev
 
   # Install CMake 3.28.3
   if dpkg -s "cmake" >/dev/null 2>&1; then