From 01b79185389c7109813cf5a4169c75ec760335e1 Mon Sep 17 00:00:00 2001
From: Serg Tereshchenko <serg.partizan@gmail.com>
Date: Tue, 6 Jul 2021 17:03:20 +0300
Subject: [PATCH 1/2] fix(ci): Fix mac m1 build

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index eb04c94..7ef4197 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -139,7 +139,7 @@ jobs:
     - name: Install Dependencies
       run:  |
         sudo apt-get install -y curl gnupg ca-certificates git gcc-multilib g++-multilib cmake libssl-dev pkg-config libfreetype6-dev libasound2-dev libexpat1-dev libxcb-composite0-dev libbz2-dev freeglut3-dev libxi-dev
-        
+
     - name: Check Formatting
       run: |
         cargo fmt --all -- --check
@@ -194,7 +194,7 @@ jobs:
 
     - name: Install Neovim
       run: |
-        brew install neovim
+        arch -arm64 brew install neovim
 
     - name: Test
       env:

From e6c32b594e6e7f04f80cafb8b787243fb9f4473e Mon Sep 17 00:00:00 2001
From: Serg Tereshchenko <serg.partizan@gmail.com>
Date: Tue, 6 Jul 2021 17:25:24 +0300
Subject: [PATCH 2/2] fix(ci): Publish snaps only for pushes in main branch

---
 .github/workflows/snap.yaml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml
index dab110d..e819d99 100644
--- a/.github/workflows/snap.yaml
+++ b/.github/workflows/snap.yaml
@@ -1,6 +1,8 @@
 name: Snap
 
-on: [push]
+on:
+  push:
+    branches: [ main ]
 
 jobs:
   snap:
@@ -9,12 +11,12 @@ jobs:
     steps:
     - name: Check out Git repository
       uses: actions/checkout@v2
-    
+
     - uses: snapcore/action-build@v1
       env:
         SNAPCRAFT_BUILD_ENVIRONMENT_MEMORY: 6G
       id: snapcraft
-    
+
     - uses: actions/upload-artifact@v2
       with:
         name: snap