fix

2018-10-11 22:59:08 +00:00
parent 9ba651d409
commit 5c5c0df8fc
2 changed files with 16 additions and 16 deletions
@@ -5,14 +5,8 @@ jobs:
    machine: true
    steps:
    - checkout
-    - run: |
-     
-        export CC="cc -m64"
-        export CXX="c++ -m64"
-        chmod +x -v *.sh
-        sudo ./runit-all.sh
-        sudo rm -rf binutils-* build-* ${gcc_version} gcc-* newlib-*
-        no_output_timeout: 2h
+    - run: sudo ./runit-all.sh 64
+      no_output_timeout: 2h
    - persist_to_workspace:
        root: /tmp/danio-gcc/64
        paths:
@@ -22,13 +16,8 @@ jobs:
    machine: true
    steps:
    - checkout
-    - run: |
-        export CC="cc -m32"
-        export CXX="c++ -m32"
-        chmod +x -v *.sh
-        sudo ./runit-all.sh
-        sudo rm -rf binutils-* build-* ${gcc_version} gcc-* newlib-*
-        no_output_timeout: 2h
+    - run: sudo ./runit-all.sh 32
+      no_output_timeout: 2h
    - persist_to_workspace:
        root: /tmp/danio-gcc/32
        paths:
@@ -46,7 +35,6 @@ jobs:
            find . -name "*.log" -exec mv -fv {} out \;
            (cd out; ls | (echo '<html><body>'; sed 's/^.*/<a href="&">&<\/a><br\/>/'; echo '</body></html>') >index.html)
            surge --project ./out --domain danio-gcc.surge.sh
-            no_output_timeout: 2h

 workflows:
  version: 2
@@ -11,6 +11,18 @@ for i in aarch64-${TUPLE}-linux alpha-${TUPLE}-linux arm-${TUPLE}-eabi arc-${TUP
 		. ./.error
 		break
 	else
+		case ${1} in
+		64)
+			export CC="cc -m64"
+			export CXX="c++ -m64"
+			chmod +x -v *.sh
+			sudo rm -rf binutils-* build-* ${gcc_version} gcc-* newlib-* ;;
+		32)
+			export CC="cc -m32"
+			export CXX="c++ -m32"
+			chmod +x -v *.sh
+			sudo rm -rf binutils-* build-* ${gcc_version} gcc-* newlib-*
+		esac
 		sudo ./danio_gcc.sh ${i} | tee out/${i}.log
 	fi
 done