Added support for macos-14

ankane · Feb 2, 2024 · ea24f8f · ea24f8f
1 parent 977f3cb
commit ea24f8f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 68 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,78 +7,17 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-22.04
+          - os: macos-14
             mariadb-version: 11.2
-          - os: ubuntu-22.04
+          - os: macos-14
             mariadb-version: 11.1
-          - os: ubuntu-22.04
+          - os: macos-14
             mariadb-version: "11.0"
-          - os: ubuntu-22.04
+          - os: macos-14
             mariadb-version: 10.11
-
-          - os: ubuntu-20.04
-            mariadb-version: 11.2
-          - os: ubuntu-20.04
-            mariadb-version: 11.1
-          - os: ubuntu-20.04
-            mariadb-version: "11.0"
-          - os: ubuntu-20.04
-            mariadb-version: 10.11
-          - os: ubuntu-20.04
-            mariadb-version: 10.6
-          - os: ubuntu-20.04
-            mariadb-version: 10.5
-
-          - os: macos-13
-            mariadb-version: 11.2
-          - os: macos-13
-            mariadb-version: 11.1
-          - os: macos-13
-            mariadb-version: "11.0"
-          - os: macos-13
-            mariadb-version: 10.11
-          - os: macos-13
-            mariadb-version: 10.6
-          - os: macos-13
-            mariadb-version: 10.5
-
-          - os: macos-12
-            mariadb-version: 11.2
-          - os: macos-12
-            mariadb-version: 11.1
-          - os: macos-12
-            mariadb-version: "11.0"
-          - os: macos-12
-            mariadb-version: 10.11
-          - os: macos-12
-            mariadb-version: 10.6
-          - os: macos-12
-            mariadb-version: 10.5
-
-          - os: windows-2022
-            mariadb-version: 11.2
-          - os: windows-2022
-            mariadb-version: 11.1
-          - os: windows-2022
-            mariadb-version: "11.0"
-          - os: windows-2022
-            mariadb-version: 10.11
-          - os: windows-2022
-            mariadb-version: 10.6
-          - os: windows-2022
-            mariadb-version: 10.5
-
-          - os: windows-2019
-            mariadb-version: 11.2
-          - os: windows-2019
-            mariadb-version: 11.1
-          - os: windows-2019
-            mariadb-version: "11.0"
-          - os: windows-2019
-            mariadb-version: 10.11
-          - os: windows-2019
+          - os: macos-14
             mariadb-version: 10.6
-          - os: windows-2019
+          - os: macos-14
             mariadb-version: 10.5
     steps:
       - uses: actions/checkout@v4

diff --git a/index.js b/index.js
@@ -63,7 +63,8 @@ if (isMac()) {
   run(`brew install ${formula}`);
 
   // start
-  bin = `/usr/local/opt/${formula}/bin`;
+  const prefix = process.env['ImageOS'] == 'macos14' ? '/opt/homebrew' : '/usr/local';
+  bin = `${prefix}/opt/${formula}/bin`;
   run(`${bin}/mysql.server start`);
 
   addToPath(bin);