Skip to content

Commit

Permalink
Fix macOS already installed warning for github actions (#3)
Browse files Browse the repository at this point in the history
Signed-off-by: paulober <44974737+paulober@users.noreply.github.com>
  • Loading branch information
paulober authored Sep 9, 2024
1 parent ed5efdf commit 4e57bd1
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions build_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ SKIP_RISCV=${SKIP_RISCV-0}
SKIP_OPENOCD=${SKIP_OPENOCD-0}

# Install prerequisites
arch -x86_64 /usr/local/bin/brew install jq libtool libusb automake hidapi
arch -arm64 /opt/homebrew/bin/brew install jq libtool libusb automake hidapi
# Risc-V prerequisites
arch -x86_64 /usr/local/bin/brew install jq libtool libusb automake hidapi --quiet
arch -arm64 /opt/homebrew/bin/brew install jq libtool libusb automake hidapi --quiet
# RISC-V prerequisites
echo "Listing local"
ls /usr/local/bin
rm /usr/local/bin/2to3*
rm /usr/local/bin/idle3*
rm /usr/local/bin/pip*
rm /usr/local/bin/py*
arch -x86_64 /usr/local/bin/brew install python3 gawk gnu-sed gmp mpfr libmpc isl zlib expat texinfo flock libslirp
arch -arm64 /opt/homebrew/bin/brew install python3 gawk gnu-sed gmp mpfr libmpc isl zlib expat texinfo flock libslirp
arch -x86_64 /usr/local/bin/brew install python3 gawk gnu-sed gmp mpfr libmpc isl zlib expat texinfo flock libslirp --quiet
arch -arm64 /opt/homebrew/bin/brew install python3 gawk gnu-sed gmp mpfr libmpc isl zlib expat texinfo flock libslirp --quiet

repos=$(cat config/repositories.json | jq -c '.repositories.[]')
export version=$(cat ./version.txt)
Expand Down Expand Up @@ -110,29 +110,29 @@ if [[ "$SKIP_RISCV" != 1 ]]; then

filename="riscv-toolchain-${version}-arm64-${suffix}.zip"

echo "Saving Risc-V Toolchain package to $filename"
echo "Saving RISC-V Toolchain package to $filename"
pushd "$builddir/riscv-install/"
tar -a -cf "$topd/bin/$filename" *
popd

# Package x64-mac riscv toolchain separately as well
version="14"
echo "Risc-V Toolchain version $version"
echo "RISC-V Toolchain version $version"

filename="riscv-toolchain-${version}-x64-mac.zip"

echo "Saving Risc-V Toolchain package to $filename"
echo "Saving RISC-V Toolchain package to $filename"
pushd "$builddir/riscv-install-x64-mac/"
tar -a -cf "$topd/bin/$filename" *
popd

# Package x64-win riscv toolchain separately as well
version="14"
echo "Risc-V Toolchain version $version"
echo "RISC-V Toolchain version $version"

filename="riscv-toolchain-${version}-x64-win.zip"

echo "Saving Risc-V Toolchain package to $filename"
echo "Saving RISC-V Toolchain package to $filename"
pushd "$builddir/riscv-install-x64-win/"
tar -a -cf "$topd/bin/$filename" *
popd
Expand Down

0 comments on commit 4e57bd1

Please sign in to comment.