Skip to content

Commit

Permalink
GitHub Actions: macOS CI fixes (#597)
Browse files Browse the repository at this point in the history
* GitHub Actions: macOS releases: Drop extra libgmp renaming

* GitHub Actions: drop workaround for actions/runner-images#1811

This has been fixed upstream by GitHub.

* GitHub Actions: re-enable MacOS CI
  • Loading branch information
elopez authored Jan 28, 2021
1 parent 4a4518b commit 01ce53e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/scripts/build-macos-release.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/sh
#!/bin/bash
set -eux

add_rpath()
{
Expand All @@ -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
}


Expand All @@ -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"

Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down

0 comments on commit 01ce53e

Please sign in to comment.