macos on arm

PhilipDeegan · Jun 16, 2024 · 93747dd · 93747dd
1 parent dd506eb
commit 93747dd
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 117 deletions.
diff --git a/.github/workflows/build_many_linux.yml b/.github/workflows/build_many_linux.yml
@@ -10,17 +10,10 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     container: quay.io/pypa/manylinux2014_x86_64
     steps:
-    - uses: actions/checkout@v3
-
-    - name: dbg
-      run: |
-        set -x
-        ld -v
-        ldd --version
-        g++ -v
+    - uses: actions/checkout@v4
 
     - run: make nix
 
@@ -33,8 +26,3 @@ jobs:
         KLOG=3 ./mkn build -Op test_mod -a "-std=c++17 -fPIC" -O 2 -g 0 -W 9
         KLOG=3 ./mkn build test pack -Op test -a "-std=c++17 -fPIC" -O 2 -g 0 -W 9
         ldd bin/build/mkn
-
-    - uses: actions/upload-artifact@v3
-      with:
-        name: mkn
-        path: bin/build/mkn
diff --git a/.github/workflows/build_nix.yml b/.github/workflows/build_nix.yml
@@ -12,14 +12,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-
-    - name: dbg
-      run: |
-        set -x
-        ld -v
-        ldd --version
-        g++ -v
+    - uses: actions/checkout@v4
 
     - run: make nix
 
@@ -32,8 +25,3 @@ jobs:
         KLOG=3 ./mkn build -Op test_mod -a "-std=c++17 -fPIC" -O 2 -g 0 -W 9
         KLOG=3 ./mkn build test pack -Op test -a "-std=c++17 -fPIC" -O 2 -g 0 -W 9
         ldd bin/build/mkn
-
-    - uses: actions/upload-artifact@v3
-      with:
-        name: mkn
-        path: bin/build/mkn
diff --git a/.github/workflows/build_osx.yml b/.github/workflows/build_osx.yml
@@ -10,26 +10,20 @@ on:
 
 jobs:
   build:
-    runs-on: macos-latest
+    strategy:
+      matrix:
+        os: [macos-12, macos-latest]
+    runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - run: make bsd
-    - run: brew install ccache
 
     - env:
         MKN_LIB_LINK_LIB: 1
         KUL_GIT_CO: --depth 1
       run: |
-        mkdir ~/.maiken
-        cp res/mkn/clang.yml ~/.maiken/settings.yaml
+        mkdir ~/.maiken && cp res/mkn/clang.yml ~/.maiken/settings.yaml
         KLOG=3 ./mkn build -dtKO 2 -W 9 -g 0
         KLOG=3 ./mkn build -dtOp test_mod
         KLOG=3 ./mkn build test pack -Op test
-
-    - uses: actions/upload-artifact@v3
-      env:
-        KUL_GIT_CO: --depth 10
-      with:
-        name: mkn
-        path: bin/build/mkn
diff --git a/.github/workflows/build_osx_arm.yml.off b/.github/workflows/build_osx_arm.yml.off
diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml
@@ -12,7 +12,7 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - run: bash -c "rm /bin/link" # interferes with cl/link.exe
 
@@ -29,8 +29,3 @@ jobs:
         mkn build -dtKO 2 -g 0 -a "-std:c++17 -EHsc"
         mkn build -dtOp test_mod -a "-std:c++17 -EHsc"
         mkn build test pack -Op test -a "-std:c++17 -EHsc"
-
-    - uses: actions/upload-artifact@v3
-      with:
-        name: mkn
-        path: bin/build/mkn.exe
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,10 +7,10 @@ jobs:
   build:
       strategy:
         matrix:
-          os: [ubuntu-latest, windows-latest, macos-latest]
+          os: [ubuntu-latest, windows-latest, macos-12, macos-latest]
       runs-on: ${{ matrix.os }}
       steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
         - if: matrix.os == 'windows-latest'
           run: bash -c "rm /bin/link" # interferes with cl/link.exe
         - if: matrix.os == 'windows-latest'
@@ -34,13 +34,6 @@ jobs:
             make nix
             KLOG=3 ./mkn build -dtKa "-std=c++17 -fPIC" -O 2 -g 0 -W 9 -o mkn_nix
 
-        - if: matrix.os == 'macos-latest'
-          env:
-            KUL_GIT_CO: --depth 1
-          run: |
-            make bsd
-            KLOG=3 ./mkn build -dtKW 9 -O 2 -g 0 -a "-std=c++17 -fPIC" -o mkn_osx
-
         - if: matrix.os == 'ubuntu-latest'
           uses: actions/upload-artifact@v3
           with:
@@ -55,18 +48,12 @@ jobs:
             path: bin/build/mkn.exe
             retention-days: 1
 
-        - if: matrix.os == 'macos-latest'
-          uses: actions/upload-artifact@v3
-          with:
-            name: maiken-${{ matrix.os }}
-            path: bin/build/mkn_osx
-            retention-days: 1
 
   build_many_linux:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     container: quay.io/pypa/manylinux2014_x86_64
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - run: make nix
     - env:
         MKN_GCC_PREFERRED: 1
@@ -78,21 +65,37 @@ jobs:
         path: bin/build/mkn_manylinux
         retention-days: 1
 
-  ## not yet configured
-  # build_arm_macos:
-  #   runs-on: self-hosted
-  #   steps:
-  #   - uses: actions/checkout@v3
-  #   - run: make bsd
-  #   - env:
-  #       MKN_GCC_PREFERRED: 1
-  #       KUL_GIT_CO: --depth 1
-  #     run: KLOG=3 ./mkn build -dtKa "-std=c++17 -fPIC" -O 2 -g 0 -W 9 -o mkn_arm_osx
-  #   - uses: actions/upload-artifact@v3
-  #     with:
-  #       name: maiken-macos-arm-latest
-  #       path: bin/build/mkn_arm_osx
-  #       retention-days: 1
+
+  build_x86_macos:
+    runs-on: macos-12
+    steps:
+    - uses: actions/checkout@v4
+    - run: make bsd
+    - env:
+        MKN_GCC_PREFERRED: 1
+        KUL_GIT_CO: --depth 1
+      run: KLOG=3 ./mkn build -dtKa "-std=c++17 -fPIC" -O 2 -g 0 -W 9 -o mkn_x86_osx
+    - uses: actions/upload-artifact@v3
+      with:
+        name: maiken-macos-12
+        path: bin/build/mkn_x86_osx
+        retention-days: 1
+
+
+  build_arm_macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v4
+    - run: make bsd
+    - env:
+        MKN_GCC_PREFERRED: 1
+        KUL_GIT_CO: --depth 1
+      run: KLOG=3 ./mkn build -dtKa "-std=c++17 -fPIC" -O 2 -g 0 -W 9 -o mkn_arm_osx
+    - uses: actions/upload-artifact@v3
+      with:
+        name: maiken-macos-latest
+        path: bin/build/mkn_arm_osx
+        retention-days: 1
 
 
   release:
@@ -112,7 +115,7 @@ jobs:
           title: "Development Build"
           files: |
             maiken-windows-latest/mkn.exe
-            maiken-macos-latest/mkn_osx
             maiken-ubuntu-latest/mkn_nix
             maiken-manylinux-latest/mkn_manylinux
-#maiken-macos-arm-latest/mkn_arm_osx
+            maiken-macos-12/mkn_x86_osx
+            maiken-macos-latest/mkn_arm_osx