CI: Update CI runners and update CMake macros for Apple Silicon brew …

…locations

.github/workflows/macos.yml

@@ -7,15 +7,13 @@ env:
   BUILD_TYPE: Release
   REPO_DIR : ${{github.workspace}}
   BUILD_DIR: ${{github.workspace}}/bin/builddir
-  BOOST_VERSION: "1.83.0"
-  BOOST_PLATFORM_VERSION: "13"
 
 permissions:
   contents: read
 
 jobs:
   build:
-    runs-on: macos-13
+    runs-on: macos-14
     permissions:
       contents: read
 
@@ -28,29 +26,15 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          brew install mysql-client
+          brew install mysql-client@8.4
           brew install openssl
+          brew install boost@1.85
           echo "OPENSSL_ROOT_DIR=$(brew --prefix --installed openssl)" >> $GITHUB_ENV
 
-      - name: Install Boost
-        uses: MarkusJx/install-boost@v2.4.5
-        id: install-boost
-        with:
-          # REQUIRED: Specify the required boost version
-          # A list of supported versions can be found here:
-          # /~https://github.com/MarkusJx/prebuilt-boost/blob/main/versions-manifest.json
-          boost_version: ${{env.BOOST_VERSION}}
-          # OPTIONAL: Specify a platform version
-          platform_version: ${{env.BOOST_PLATFORM_VERSION}}
-          # OPTIONAL: Specify a toolset
-          toolset: clang
-          # NOTE: If a boost version matching all requirements cannot be found,
-          # this build step will fail
-
       - name: Configure
         env:
-          BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
-        run: cmake -DBUILD_ELUNA=ON -B ${{env.BUILD_DIR}} -S ${{env.REPO_DIR}} -DBoost_ARCHITECTURE=-x64
+          BOOST_ROOT: /opt/homebrew/opt/boost@1.85
+        run: cmake -DBUILD_ELUNA=ON -B ${{env.BUILD_DIR}} -S ${{env.REPO_DIR}} -DBoost_ARCHITECTURE=-arm64
 
       - name: Build
         env:
@@ -61,7 +45,7 @@ jobs:
     permissions:
       contents: none
     name: Send Notification to Discord on Failure
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: # make sure the notification is sent AFTER the jobs you want included have completed
       - build
     if: failure()

.github/workflows/ubuntu.yml

@@ -85,7 +85,7 @@ jobs:
 
   notify:
     name: Send Notification to Discord on Failure
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     permissions:
       contents: none
     needs: # make sure the notification is sent AFTER the jobs you want included have completed

.github/workflows/windows-release.yml

@@ -1,6 +1,5 @@
 name: Windows Release Build
 
-#
 on:
   schedule:
     # every day at 6am
@@ -137,7 +136,7 @@ jobs:
 
   notify-success:
     name: Send Notification to Discord on Success
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     permissions:
       contents: none
     needs:
@@ -180,7 +179,7 @@ jobs:
 
   notify:
     name: Send Notification to Discord on Failure
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     permissions:
       contents: none
     needs: # make sure the notification is sent AFTER the jobs you want included have completed

.github/workflows/windows.yml

@@ -1,4 +1,3 @@
-
 name: Windows Build
 
 on: [push]
@@ -70,7 +69,7 @@ jobs:
 
   notify:
     name: Send Notification to Discord on Failure
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     permissions:
       contents: none
     needs: # make sure the notification is sent AFTER the jobs you want included have completed

cmake/macros/FindMySQL.cmake

@@ -23,6 +23,8 @@ if( UNIX )
     /usr/local/bin/
     /usr/bin/
     /usr/local/opt/mysql/bin/
+    /opt/homebrew/opt/mysql-client/bin
+    /opt/homebrew/opt/mysql-client@8.4/bin
     /opt/mysql/mysql/bin/
   )
 
@@ -77,6 +79,10 @@ find_path(MYSQL_INCLUDE_DIR
     /usr/local/opt/mysql/include
     /usr/local/opt/mysql-client/include
     /usr/local/opt/mysql-client/include/mysql
+    /opt/homebrew/opt/mysql-client
+    /opt/homebrew/opt/mysql-client/include
+    /opt/homebrew/opt/mysql-client@8.4
+    /opt/homebrew/opt/mysql-client@8.4/include
     /opt/mysql/mysql/include
     /opt/mysql/mysql/include/mysql
     "C:/Program Files/MySQL/include"
@@ -107,6 +113,10 @@ foreach(LIB ${MYSQL_ADD_LIBRARIES})
       /usr/local/mysql/lib/mysql
       /usr/local/opt/mysql/lib
       /usr/local/opt/mysql-client/lib
+      /opt/homebrew/opt/mysql-client
+      /opt/homebrew/opt/mysql-client/lib
+      /opt/homebrew/opt/mysql-client@8.4
+      /opt/homebrew/opt/mysql-client@8.4/lib
       /opt/mysql/mysql/lib
       /opt/mysql/mysql/lib/mysql
     DOC "Specify the location of the mysql library here."