ci: Support macOS ARM64

Part of diskuv/dkml-installer-ocaml#80

Author: jonahbeckford

CHANGES.md

@@ -1,5 +1,10 @@
 # Changes
 
+## 2.1.0
+
+- Support macOS ARM64
+- Bump GitLab SaaS hardware from `macos-11-xcode-12` (x86_64) to `macos-12-xcode-14` (arm64)
+
 ## Pending (1.2.1)
 
 > The minimum Dune language requirement is `(lang dune 3.0)`. Please update

README.md

@@ -198,6 +198,8 @@ Run one of:
 ```bash
 # macOS/Intel (or macOS/ARM64 with Rosetta emulator)
 sh ci/setup-dkml/pc/setup-dkml-darwin_x86_64.sh
+# -or- macOS/ARM64
+sh ci/setup-dkml/pc/setup-dkml-darwin_arm64.sh
 
 # Linux on 64-bit Intel/AMD. Docker is required.
 #   - Running this from macOS/Intel with Docker or macOS/Silicon with Docker will also work

bump-packages.cmake

@@ -25,6 +25,7 @@ DkMLBumpPackagesParticipant_TestPromote(REL_FILENAMES
     test/gh-windows/pre/action.yml
     test/gl/setup-dkml.gitlab-ci.yml
     test/pc/setup-dkml-darwin_x86_64.sh
+    test/pc/setup-dkml-darwin_arm64.sh
     test/pc/setup-dkml-linux_x86.sh
     test/pc/setup-dkml-linux_x86_64.sh
     test/pc/setup-dkml-windows_x86.ps1

src/logic/model.ml

@@ -311,10 +311,10 @@ let matrix =
     [
       ("abi_pattern", Jg_types.Tstr {|macos-darwin_all|});
       ("gh_os", Jg_types.Tstr "macos-latest");
-      ("gl_image", Jg_types.Tstr "macos-11-xcode-12");
+      ("gl_image", Jg_types.Tstr "macos-12-xcode-14");
       ("gh_unix_shell", Jg_types.Tstr {|sh|});
       ("bootstrap_opam_version", bootstrap_opam_version);
-      ("dkml_host_abi", Jg_types.Tstr {|darwin_x86_64|});
+      ("dkml_host_abi", Jg_types.Tstr {|darwin_arm64|});
       ("gh_opam_root", Jg_types.Tstr {|/Users/runner/.opam|});
       ("gl_opam_root", Jg_types.Tstr {|${CI_PROJECT_DIR}/.ci/o|});
       ("pc_opam_root", Jg_types.Tstr {|${PC_PROJECT_DIR}/.ci/o|});

src/pc_setup_dkml.ml

@@ -41,7 +41,7 @@ let () =
   let usage =
     Printf.sprintf
       "%s [--output-windows_x86 OUTPUT_FILE.ps1] [--output-windows_x86_64 \
-       OUTPUT_FILE.ps1] [--output-darwin_x86_64 OUTPUT_FILE.sh] \
+       OUTPUT_FILE.ps1] [--output-darwin_x86_64 OUTPUT_FILE.sh] [--output-darwin_arm64 OUTPUT_FILE.sh] \
        [--output-linux_x86 OUTPUT_FILE.sh] [--output-linux_x86_64 \
        OUTPUT_FILE.sh]\n\
        At least one --output-<ABI> option must be selected." exe_name
@@ -74,6 +74,8 @@ let () =
         "Output Powershell script for Windows 64-bit" );
       output_unix_abi_arg ~dkml_host_abi:"darwin_x86_64"
         ~descr:"macOS/Intel (or macOS/ARM64 with Rosetta emulator)";
+      output_unix_abi_arg ~dkml_host_abi:"darwin_arm64"
+        ~descr:"macOS/ARM64";
       output_unix_abi_arg ~dkml_host_abi:"linux_x86"
         ~descr:"Linux on 32-bit Intel/AMD";
       output_unix_abi_arg ~dkml_host_abi:"linux_x86_64"

src/setup_dkml_scaffold.ml

@@ -165,6 +165,23 @@ let scaffold_pc ~output_dir () =
  (action
   (diff setup-dkml-darwin_x86_64.sh setup-dkml-darwin_x86_64-gen.sh)))
 
+; darwin_arm64
+
+(rule
+ (target setup-dkml-darwin_arm64-gen.sh)
+ (enabled_if %%{bin-available:pc-setup-dkml})
+ (action
+  (setenv
+   OCAMLRUNPARAM
+   b
+   (run pc-setup-dkml --output-darwin_arm64 %%{target}))))
+
+(rule
+ (alias gen-dkml)
+ (enabled_if %%{bin-available:pc-setup-dkml})
+ (action
+  (diff setup-dkml-darwin_arm64.sh setup-dkml-darwin_arm64-gen.sh)))
+
 ; linux_x86
 
 (rule

test/gh-darwin/post/action.yml

@@ -20,14 +20,14 @@ runs:
         # Select correct Darwin matrix variables
         case "${{ matrix.dkml_host_abi }}" in
         
-        darwin_x86_64)
+        darwin_arm64)
           dkml_host_os='darwin';
           opam_root_cacheable='/Users/runner/.opam';
           abi_pattern='macos-darwin_all';
           gh_os='macos-latest';
           gh_unix_shell='sh';
           bootstrap_opam_version='2.2.0-alpha-20221228';
-          dkml_host_abi='darwin_x86_64';
+          dkml_host_abi='darwin_arm64';
           opam_root='/Users/runner/.opam' ;;
           
         *)  echo "FATAL: Unsupported dkml_host_abi=$dkml_host_abi in Darwin action.yml"; exit 107 ;;

test/gh-darwin/pre/action.yml

@@ -61,14 +61,14 @@ runs:
         # Select correct Darwin matrix variables
         case "${{ matrix.dkml_host_abi }}" in
         
-        darwin_x86_64)
+        darwin_arm64)
           dkml_host_os='darwin';
           opam_root_cacheable='/Users/runner/.opam';
           abi_pattern='macos-darwin_all';
           gh_os='macos-latest';
           gh_unix_shell='sh';
           bootstrap_opam_version='2.2.0-alpha-20221228';
-          dkml_host_abi='darwin_x86_64';
+          dkml_host_abi='darwin_arm64';
           opam_root='/Users/runner/.opam' ;;
           
         *)  echo "FATAL: Unsupported dkml_host_abi=$dkml_host_abi in Darwin action.yml"; exit 107 ;;

test/gl/setup-dkml.gitlab-ci.yml

@@ -2370,9 +2370,9 @@ variables:
       { dkml_host_os: 'darwin',
         opam_root_cacheable: '${CI_PROJECT_DIR}/.ci/o',
         abi_pattern: 'macos-darwin_all',
-        gl_image: 'macos-11-xcode-12',
+        gl_image: 'macos-12-xcode-14',
         bootstrap_opam_version: '2.2.0-alpha-20221228',
-        dkml_host_abi: 'darwin_x86_64',
+        dkml_host_abi: 'darwin_arm64',
         opam_root: '${CI_PROJECT_DIR}/.ci/o' },
 
     ]

test/pc/dune

@@ -43,6 +43,21 @@
  (action
   (diff setup-dkml-darwin_x86_64.sh setup-dkml-darwin_x86_64-gen.sh)))
 
+; darwin_arm64
+
+(rule
+ (target setup-dkml-darwin_arm64-gen.sh)
+ (action
+  (setenv
+   OCAMLRUNPARAM
+   b
+   (run ../../src/pc_setup_dkml.exe --output-darwin_arm64 %{target}))))
+
+(rule
+ (alias runtest)
+ (action
+  (diff setup-dkml-darwin_arm64.sh setup-dkml-darwin_arm64-gen.sh)))
+
 ; linux_x86
 
 (rule