Improve windows bootstrapping and make msys2 configurable

.gitlab-ci.yml

@@ -66,6 +66,14 @@ variables:
     ARCH: "64"
     CABAL_DIR: "$CI_PROJECT_DIR/cabal"
 
+.darwin:aarch64:
+  tags:
+    - aarch64-darwin-m1
+  variables:
+    OS: "DARWIN"
+    ARCH: "ARM64"
+    CABAL_DIR: "$CI_PROJECT_DIR/cabal"
+
 .freebsd:
   tags:
     - x86_64-freebsd
@@ -133,6 +141,14 @@ variables:
   before_script:
     - ./.gitlab/before_script/darwin/install_deps.sh
 
+.test_ghcup_version:darwin:aarch64:
+  extends:
+    - .test_ghcup_version
+    - .darwin:aarch64
+    - .root_cleanup
+  before_script:
+    - ./.gitlab/before_script/darwin/install_deps.sh
+
 .test_ghcup_version:freebsd:
   extends:
     - .test_ghcup_version
@@ -255,6 +271,14 @@ test:mac:latest:
     CABAL_VERSION: "3.4.0.0"
   needs: []
 
+test:mac:recommended:aarch64:
+  stage: test
+  extends: .test_ghcup_version:darwin:aarch64
+  variables:
+    GHC_VERSION: "8.10.5"
+    CABAL_VERSION: "3.4.0.0"
+  needs: []
+
 
 ######## freebsd test ########