Skip to content

Commit 4e57bd1

Browse files
authored
Fix macOS already installed warning for github actions (#3)
Signed-off-by: paulober <[email protected]>
1 parent ed5efdf commit 4e57bd1

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

build_macos.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ SKIP_RISCV=${SKIP_RISCV-0}
77
SKIP_OPENOCD=${SKIP_OPENOCD-0}
88

99
# Install prerequisites
10-
arch -x86_64 /usr/local/bin/brew install jq libtool libusb automake hidapi
11-
arch -arm64 /opt/homebrew/bin/brew install jq libtool libusb automake hidapi
12-
# Risc-V prerequisites
10+
arch -x86_64 /usr/local/bin/brew install jq libtool libusb automake hidapi --quiet
11+
arch -arm64 /opt/homebrew/bin/brew install jq libtool libusb automake hidapi --quiet
12+
# RISC-V prerequisites
1313
echo "Listing local"
1414
ls /usr/local/bin
1515
rm /usr/local/bin/2to3*
1616
rm /usr/local/bin/idle3*
1717
rm /usr/local/bin/pip*
1818
rm /usr/local/bin/py*
19-
arch -x86_64 /usr/local/bin/brew install python3 gawk gnu-sed gmp mpfr libmpc isl zlib expat texinfo flock libslirp
20-
arch -arm64 /opt/homebrew/bin/brew install python3 gawk gnu-sed gmp mpfr libmpc isl zlib expat texinfo flock libslirp
19+
arch -x86_64 /usr/local/bin/brew install python3 gawk gnu-sed gmp mpfr libmpc isl zlib expat texinfo flock libslirp --quiet
20+
arch -arm64 /opt/homebrew/bin/brew install python3 gawk gnu-sed gmp mpfr libmpc isl zlib expat texinfo flock libslirp --quiet
2121

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

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

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

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

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

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

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

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

135-
echo "Saving Risc-V Toolchain package to $filename"
135+
echo "Saving RISC-V Toolchain package to $filename"
136136
pushd "$builddir/riscv-install-x64-win/"
137137
tar -a -cf "$topd/bin/$filename" *
138138
popd

0 commit comments

Comments
 (0)