From cd8a23391a9ae6d635e03c36b233664d4c56a554 Mon Sep 17 00:00:00 2001
From: Alula <6276139+alula@users.noreply.github.com>
Date: Tue, 22 Mar 2022 03:15:43 +0100
Subject: [PATCH] Add Apple M1 builds

---
 .appveyor.yml | 36 ++++++++++++++++++++++++------------
 README.md     |  3 ++-
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 3d9cd30..a9ae61e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -8,11 +8,6 @@ environment:
   global:
     PROJECT_NAME: doukutsu-rs
   matrix:
-    - channel: stable
-      target: aarch64-apple-darwin
-      target_name: macos
-      job_name: mac-arm64
-      appveyor_build_worker_image: macos-monterey
     - channel: stable
       target: x86_64-pc-windows-msvc
       target_name: win64
@@ -29,9 +24,14 @@ environment:
       appveyor_build_worker_image: Ubuntu
     - channel: stable
       target: x86_64-apple-darwin
-      target_name: macos
+      target_name: mac-intel
       job_name: mac-x64
       appveyor_build_worker_image: macos-monterey
+    - channel: stable
+      target: aarch64-apple-darwin
+      target_name: mac-m1
+      job_name: mac-arm64
+      appveyor_build_worker_image: macos-monterey
 
 matrix:
   fast_finish: true
@@ -52,8 +52,12 @@ for:
       - cargo -vV
 
     cache:
-      - '%USERPROFILE%\.cache\sccache -> Cargo.toml'
-      - '%USERPROFILE%\.cargo -> Cargo.toml'
+      - '%USERPROFILE%\.cache -> Cargo.toml'
+      - '%USERPROFILE%\.cargo\bin -> Cargo.toml'
+      - '%USERPROFILE%\.cargo\registry\index -> Cargo.toml'
+      - '%USERPROFILE%\.cargo\registry\cache -> Cargo.toml'
+      - '%USERPROFILE%\.cargo\git\db -> Cargo.toml'
+      - '%USERPROFILE%\.rustup -> Cargo.toml'
       - 'target -> Cargo.toml'
 
     build_script:
@@ -86,8 +90,12 @@ for:
       - cargo install cargo-bundle
 
     cache:
-      - '$HOME/.cache/sccache -> Cargo.toml'
-      - '$HOME/.cargo -> Cargo.toml'
+      - '$HOME/.cache -> Cargo.toml'
+      - '$HOME/.cargo/bin -> Cargo.toml'
+      - '$HOME/.cargo/registry/index -> Cargo.toml'
+      - '$HOME/.cargo/registry/cache -> Cargo.toml'
+      - '$HOME/.cargo/git/db -> Cargo.toml'
+      - '$HOME/.rustup -> Cargo.toml'
       - 'target -> Cargo.toml'
 
     build_script:
@@ -118,8 +126,12 @@ for:
       - cargo -vV
 
     cache:
-      - '$HOME/.cache/sccache -> Cargo.toml'
-      - '$HOME/.cargo -> Cargo.toml'
+      - '$HOME/.cache -> Cargo.toml'
+      - '$HOME/.cargo/bin -> Cargo.toml'
+      - '$HOME/.cargo/registry/index -> Cargo.toml'
+      - '$HOME/.cargo/registry/cache -> Cargo.toml'
+      - '$HOME/.cargo/git/db -> Cargo.toml'
+      - '$HOME/.rustup -> Cargo.toml'
       - 'target -> Cargo.toml'
 
     build_script:
diff --git a/README.md b/README.md
index 12ed1b0..1bf62fe 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,8 @@ in [Rust](https://www.rust-lang.org/).
   
   Permalinks to latest builds from `master` branch:
   - Windows (x86_64): https://ci.appveyor.com/api/projects/alula/doukutsu-rs/artifacts/doukutsu-rs_win64.zip?branch=master&job=windows-x64
-  - macOS (Intel, 64-bit, 10.14+) https://ci.appveyor.com/api/projects/alula/doukutsu-rs/artifacts/doukutsu-rs_macos.zip?branch=master&job=mac-x64
+  - macOS (Intel, 64-bit, 10.14+) https://ci.appveyor.com/api/projects/alula/doukutsu-rs/artifacts/doukutsu-rs_mac-intel.zip?branch=master&job=mac-x64
+  - macOS (Apple M1, 11.0+) https://ci.appveyor.com/api/projects/alula/doukutsu-rs/artifacts/doukutsu-rs_mac-m1.zip?branch=master&job=mac-arm64
   - Linux (x86_64) https://ci.appveyor.com/api/projects/alula/doukutsu-rs/artifacts/doukutsu-rs_linux.zip?branch=master&job=linux-x64
 - [Get stable/beta builds from GitHub Releases](https://github.com/doukutsu-rs/doukutsu-rs/releases) (executables only,
   no data files bundled, see below for instructions)