Commit dee764be authored by Daniel Brown's avatar Daniel Brown

update

parent 77620750
...@@ -8,7 +8,7 @@ IF "%ARCH%"=="64" ( ...@@ -8,7 +8,7 @@ IF "%ARCH%"=="64" (
) )
IF "%ARCH%"=="32" ( IF "%ARCH%"=="32" (
c:\msys64\mingw32 /bin/bash ./finesse.sh --build-win32 c:\msys32\mingw32 /bin/bash ./finesse.sh --build-win32
) )
@ECHO OFF @ECHO OFF
......
...@@ -5,11 +5,6 @@ unamestr=`uname` ...@@ -5,11 +5,6 @@ unamestr=`uname`
unamem=`uname -m` unamem=`uname -m`
branch=`git rev-parse --abbrev-ref HEAD` branch=`git rev-parse --abbrev-ref HEAD`
if [[ "$branch" != 'master' ]]; then
echo !! Trying to push non-master branch to Conda !!
exit 1
fi
if [[ "$unamestr" == 'Linux' ]]; then if [[ "$unamestr" == 'Linux' ]]; then
if [[ "${ARCH}" == '32' ]]; then if [[ "${ARCH}" == '32' ]]; then
./finesse.sh --build-linux32 ./finesse.sh --build-linux32
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment