From f8be6c636cf66f638befef9c3425b3685ced45a2 Mon Sep 17 00:00:00 2001
From: Jonas Schievink <jonas.schievink@ferrous-systems.com>
Date: Mon, 12 Oct 2020 19:19:24 +0200
Subject: macOS: install GNU tar

---
 .github/workflows/ci.yaml | 6 ++++++
 Cargo.lock                | 1 +
 2 files changed, 7 insertions(+)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a19bc9ad3..5e92fbb6d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -42,6 +42,12 @@ jobs:
       if: matrix.os == 'windows-latest'
       run: Rename-Item C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc.old
 
+    - name: Install GNU tar
+      if: matrix.os == 'macos-latest'
+      run: |
+        brew install gnu-tar
+        echo PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH" >> $GITHUB_ENV
+
     - name: Install Rust toolchain
       uses: actions-rs/toolchain@v1
       with:
diff --git a/Cargo.lock b/Cargo.lock
index fdb62e6ea..320f70529 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,5 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+# asdasdasdasd
 [[package]]
 name = "addr2line"
 version = "0.13.0"
-- 
cgit v1.2.3


From 8f61ee6b9b090dc6c1303e9508f329491a76ee16 Mon Sep 17 00:00:00 2001
From: Jonas Schievink <jonas.schievink@ferrous-systems.com>
Date: Mon, 12 Oct 2020 19:53:03 +0200
Subject: Reenable bors gate for macOS

---
 bors.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bors.toml b/bors.toml
index 4c980a24d..13ce236df 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1,8 +1,9 @@
 status = [
     "Rust (ubuntu-latest)",
     "Rust (windows-latest)",
-    # "Rust (macos-latest)",
+    "Rust (macos-latest)",
     "TypeScript (ubuntu-latest)",
     "TypeScript (windows-latest)",
+    "TypeScript (macos-latest)",
 ]
 delete_merged_branches = true
-- 
cgit v1.2.3


From 1cb64a70d643a194839120350f5bbc619314205a Mon Sep 17 00:00:00 2001
From: Jonas Schievink <jonas.schievink@ferrous-systems.com>
Date: Mon, 12 Oct 2020 19:55:55 +0200
Subject: Add comment and link to upstream issue

---
 .github/workflows/ci.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 5e92fbb6d..77f2e2e16 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -42,6 +42,8 @@ jobs:
       if: matrix.os == 'windows-latest'
       run: Rename-Item C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc C:\Users\runneradmin\.rustup\toolchains\stable-x86_64-pc-windows-msvc.old
 
+    # Work around https://github.com/actions/cache/issues/403 by using GNU tar
+    # instead of BSD tar.
     - name: Install GNU tar
       if: matrix.os == 'macos-latest'
       run: |
-- 
cgit v1.2.3


From e99cb578c99ca574dff6073d673eef9bb96ef4e3 Mon Sep 17 00:00:00 2001
From: Jonas Schievink <jonasschievink@gmail.com>
Date: Mon, 12 Oct 2020 21:48:42 +0200
Subject: Remove disabled builder

---
 bors.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bors.toml b/bors.toml
index 13ce236df..1f4eb510a 100644
--- a/bors.toml
+++ b/bors.toml
@@ -4,6 +4,5 @@ status = [
     "Rust (macos-latest)",
     "TypeScript (ubuntu-latest)",
     "TypeScript (windows-latest)",
-    "TypeScript (macos-latest)",
 ]
 delete_merged_branches = true
-- 
cgit v1.2.3