commit 3bb87c7746435b9f3cde863bf93a2d47d987d1e6
parent 97cf92e5f624f1f2ed99fcccab268004e2a9ab66
Author: Matt Demanett <matt@demanett.net>
Date: Sun, 19 Jul 2020 22:33:25 -0400
Revert "Attempt to make it easier to find build errors in mac autobuild."
This reverts commit 97cf92e5f624f1f2ed99fcccab268004e2a9ab66.
Diffstat:
2 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/.github/actions/build_osx/Dockerfile b/.github/actions/build_osx/Dockerfile
@@ -2,8 +2,8 @@
FROM debian
RUN apt-get update && \
- apt-get upgrade -yy -qq && \
- apt-get install -yy -qq \
+ apt-get upgrade -yy && \
+ apt-get install -yy \
automake \
bison \
curl \
@@ -26,10 +26,10 @@ RUN apt-get update && \
libgl1-mesa-dev \
libglu1-mesa-dev \
jq \
- rsync > /dev/null
+ rsync
ENV OSXCROSS_SDK_VERSION 10.11
-RUN ((SDK_VERSION=$OSXCROSS_SDK_VERSION \
+RUN SDK_VERSION=$OSXCROSS_SDK_VERSION \
mkdir /opt/osxcross && \
cd /opt && \
git clone https://github.com/tpoechtrager/osxcross.git && \
@@ -40,7 +40,7 @@ RUN ((SDK_VERSION=$OSXCROSS_SDK_VERSION \
curl -L -o ./tarballs/MacOSX${OSXCROSS_SDK_VERSION}.sdk.tar.xz \
https://github.com/apriorit/osxcross-sdks/raw/master/MacOSX${OSXCROSS_SDK_VERSION}.sdk.tar.xz && \
yes | PORTABLE=true ./build.sh && \
- ./build_compiler_rt.sh) &> /tmp/build.out) || cat /tmp/build.out
+ ./build_compiler_rt.sh
ENV PATH $PATH:/opt/osxcross/target/bin
diff --git a/.github/actions/build_osx/entrypoint.sh b/.github/actions/build_osx/entrypoint.sh
@@ -2,18 +2,6 @@
set -eu
-echo
-echo
-echo
-echo
-echo
-echo Actual build starts now....
-echo
-echo
-echo
-echo
-echo
-
export RACK_DIR=${GITHUB_WORKSPACE}/Rack-SDK
export RACK_USER_DIR=${GITHUB_WORKSPACE}
@@ -22,7 +10,7 @@ export CXX=x86_64-apple-darwin15-clang++
export STRIP=x86_64-apple-darwin15-strip
curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}.zip -o rack-sdk.zip
-unzip -q -o rack-sdk.zip
+unzip -o rack-sdk.zip
rm rack-sdk.zip
make dist