Skip to content

Commit

Permalink
Use M1 Github runner.
Browse files Browse the repository at this point in the history
  • Loading branch information
fruffy committed Feb 27, 2024
1 parent 6b9d005 commit c5cfe5f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ jobs:
test-mac-os:
strategy:
fail-fast: false
runs-on: macos-12
runs-on: macos-13-xlarge
env:
CTEST_PARALLEL_LEVEL: 4
steps:
Expand Down
31 changes: 17 additions & 14 deletions tools/install_mac_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,33 @@
set -e # Exit on error.
set -x # Make command execution verbose

# Install some custom requirements on OS X using brew
BREW=/usr/local/bin/brew

# Set up Homebrew differently for arm64.
if [[ $(uname -m) == 'arm64' ]]; then
BREW=/opt/homebrew/bin/brew
else
BREW=/usr/local/bin/brew
fi

if [[ ! -x $BREW ]]; then
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
fi
HOMEBREW_PREFIX=$($BREW --prefix)

# Install some custom requirements on OS X using brew
BOOST_LIB="[email protected]"

$BREW install autoconf automake bdw-gc ccache cmake \
libtool openssl pkg-config python coreutils
libtool openssl pkg-config coreutils bison grep \
${BOOST_LIB}

# We need to link boost.
$BREW install ${BOOST_LIB}
$BREW link ${BOOST_LIB}
# Prefer Homebrew's bison and grep over the macOS-provided version
$BREW install bison
echo 'export PATH="/usr/local/opt/bison/bin:$PATH"' >> ~/.bash_profile
$BREW install grep
echo 'export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH"' >> ~/.bash_profile
echo 'export PATH="$($BREW --prefix bison)/bin:$PATH"' >> ~/.bash_profile
echo 'export PATH="$HOMEBREW_PREFIX/opt/grep/libexec/gnubin:$PATH"' >> ~/.bash_profile

source ~/.bash_profile


# install pip and required pip packages
# curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
# python get-pip.py --user
# use scapy 2.4.5, which is the version on which ptf depends
pip3 install --user scapy==2.4.5 ply==3.8
# Install required pip packages
pip3 install --user -r requirements.txt

0 comments on commit c5cfe5f

Please sign in to comment.