From 01ce53ec5b9f035e609e9f1174f9880b5371b0ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20L=C3=B3pez?=
 <2642849+elopez@users.noreply.github.com>
Date: Thu, 28 Jan 2021 14:42:37 -0300
Subject: [PATCH] GitHub Actions: macOS CI fixes (#597)

* GitHub Actions: macOS releases: Drop extra libgmp renaming

* GitHub Actions: drop workaround for actions/virtual-environments#1811

This has been fixed upstream by GitHub.

* GitHub Actions: re-enable MacOS CI
---
 .github/scripts/build-macos-release.sh |  6 +++---
 .github/workflows/ci.yml               | 12 +++---------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/scripts/build-macos-release.sh b/.github/scripts/build-macos-release.sh
index 817d8b422..3e1f1b366 100755
--- a/.github/scripts/build-macos-release.sh
+++ b/.github/scripts/build-macos-release.sh
@@ -1,4 +1,5 @@
-#!/bin/sh
+#!/bin/bash
+set -eux
 
 add_rpath()
 {
@@ -13,7 +14,7 @@ fix_path()
     NEW="$3"
     OLD=$(otool -L "$BINARY" | grep "$MATCH" | awk '{print $1}')
     install_name_tool -change "$OLD" "$NEW" "$BINARY"
-    cp -n "$OLD" "$(dirname "$BINARY")/$(basename "$NEW")"
+    cp -n "$OLD" "$(dirname "$BINARY")/$(basename "$NEW")" || true
 }
 
 
@@ -25,7 +26,6 @@ BINARY="$BUILD/echidna-test"
 add_rpath "$BINARY"
 fix_path "$BINARY" libsecp256k1 "@rpath/libsecp256k1.dylib"
 fix_path "$BINARY" libff "@rpath/libff.dylib"
-fix_path "$BINARY" libgmp "@rpath/libgmp.dylib"
 fix_path "$BUILD/libff.dylib" libgmp "@rpath/libgmp.dylib"
 fix_path "$BUILD/libsecp256k1.dylib" libgmp "@rpath/libgmp.dylib"
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 66ed73b0c..0b914db71 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,20 +15,14 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-        #  - macos-latest
+          - macos-latest
         include:
           - os: ubuntu-latest
             apt-get: autoconf automake libtool
-         # - os: macos-latest
-         #   brew: automake
+          - os: macos-latest
+            brew: automake
          
     steps:
-      - name: Workaround for actions/virtual-environments#1811
-        if: runner.os == 'macOS'
-        run: |
-          brew untap local/homebrew-openssl
-          brew untap local/homebrew-python2
-
       - name: Workaround for actions/cache#403
         if: runner.os == 'macOS'
         run: |