From 41e6b81541c0c091b3ab95761bdddbf3b7b2f177 Mon Sep 17 00:00:00 2001
From: yeastplume <yeastplume@protonmail.com>
Date: Mon, 4 Nov 2024 14:01:58 +0000
Subject: [PATCH 1/3] attempt at dual mac builds

---
 .github/workflows/cd.yaml | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
index 4f5c88126..c3e7f5feb 100644
--- a/.github/workflows/cd.yaml
+++ b/.github/workflows/cd.yaml
@@ -27,14 +27,14 @@ jobs:
                     target/release/grin-${{  github.ref_name }}-linux-x86_64.tar.gz
                     target/release/grin-${{  github.ref_name }}-linux-x86_64-sha256sum.txt
 
-    macos-release:
-        name: macOS Release
+    macos-release-x86:
+        name: macOS Release - x86_64
         runs-on: macos-latest
         steps:
           - name: Checkout
             uses: actions/checkout@v3
           - name: Build
-            run: cargo build --release
+            run: cargo build --release --target x86_64-apple-darwin
           - name: Archive
             working-directory: target/release
             run: tar -czvf grin-${{  github.ref_name }}-macos-x86_64.tar.gz grin
@@ -47,7 +47,28 @@ jobs:
                 files: |
                     target/release/grin-${{  github.ref_name }}-macos-x86_64.tar.gz
                     target/release/grin-${{  github.ref_name }}-macos-x86_64-sha256sum.txt
-    
+
+    macos-release-arm64:
+        name: macOS Release - arm64
+        runs-on: macos-latest
+        steps:
+          - name: Checkout
+            uses: actions/checkout@v3
+          - name: Build
+            run: cargo build --release
+          - name: Archive
+            working-directory: target/release
+            run: tar -czvf grin-${{  github.ref_name }}-macos-arm64.tar.gz grin
+          - name: Create Checksum
+            working-directory: target/release
+            run: openssl sha256 grin-${{  github.ref_name }}-macos-arm64.tar.gz > grin-${{  github.ref_name }}-macos-arm64-sha256sum.txt
+          - name: Release
+            uses: softprops/action-gh-release@v1
+            with:
+                files: |
+                    target/release/grin-${{  github.ref_name }}-macos-arm64.tar.gz
+                    target/release/grin-${{  github.ref_name }}-macos-arm64-sha256sum.txt
+     
     windows-release:
         name: Windows Release
         runs-on: windows-2019

From 1936ccd471138d4599957f3505813de434cf0225 Mon Sep 17 00:00:00 2001
From: yeastplume <yeastplume@gmail.com>
Date: Tue, 12 Nov 2024 15:37:15 +0000
Subject: [PATCH 2/3] add initial devcontainer

---
 .devcontainer/Dockerfile        |  6 ++++++
 .devcontainer/devcontainer.json | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100755 .devcontainer/Dockerfile
 create mode 100644 .devcontainer/devcontainer.json

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100755
index 000000000..21a4731fe
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,6 @@
+# Rust latest
+FROM mcr.microsoft.com/devcontainers/rust:latest
+
+# Install Required Dependencies
+RUN apt-get -qq update
+RUN apt-get install build-essential cmake git libgit2-dev clang libncurses5-dev libncursesw5-dev zlib1g-dev pkg-config libssl-dev llvm
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 000000000..ba8003bdd
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,20 @@
+{
+    "name": "rust-grin-devcontainer",
+    "build": {
+      "dockerfile": "Dockerfile",
+      "context": ".."
+    },
+    "customizations": {
+      "vscode": {
+        "extensions": [
+          "dbaeumer.vscode-eslint",
+          "vadimcn.vscode-lldb",
+          "tamasfe.even-better-toml",
+          "rust-lang.rust-analyzer",
+          "esbenp.prettier-vscode",
+          "github.copilot",
+          "github.copilot-chat"
+        ]
+      }
+    }
+  }
\ No newline at end of file

From 320e45ba1c34a5103d388d36d0462257b04b4d26 Mon Sep 17 00:00:00 2001
From: yeastplume <yeastplume@gmail.com>
Date: Tue, 12 Nov 2024 16:06:18 +0000
Subject: [PATCH 3/3] correct dependency import

---
 .devcontainer/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 21a4731fe..8067909b4 100755
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -3,4 +3,4 @@ FROM mcr.microsoft.com/devcontainers/rust:latest
 
 # Install Required Dependencies
 RUN apt-get -qq update
-RUN apt-get install build-essential cmake git libgit2-dev clang libncurses5-dev libncursesw5-dev zlib1g-dev pkg-config libssl-dev llvm
+RUN apt-get install -y build-essential cmake git libgit2-dev clang libncurses5-dev libncursesw5-dev zlib1g-dev pkg-config libssl-dev llvm