fix

2018-10-11 22:13:14 +00:00
parent d459b2cc4a
commit 03f570df58
1 changed files with 10 additions and 9 deletions
@@ -1,11 +1,8 @@
-defaults: &defaults
-    working_directory: /tmp/danio-gcc
-    machine: true
-
 version: 2
 jobs:
  build64:
-    <<: *defaults
+    working_directory: /tmp/danio-gcc/64
+    machine: true
    steps:
    - checkout
    - run: |
@@ -17,11 +14,12 @@ jobs:
        sudo rm -rf binutils-* build-* ${gcc_version} gcc-* newlib-*
        no_output_timeout: 2h
    - persist_to_workspace:
-        root: /tmp/danio-gcc
+        root: /tmp/danio-gcc/64
        paths:
            - out
  build32:
-    <<: *defaults
+    working_directory: /tmp/danio-gcc/32
+    machine: true
    steps:
    - checkout
    - run: |
@@ -32,16 +30,19 @@ jobs:
        sudo rm -rf binutils-* build-* ${gcc_version} gcc-* newlib-*
        no_output_timeout: 2h
    - persist_to_workspace:
-        root: /tmp/danio-gcc
+        root: /tmp/danio-gcc/32
        paths:
            - out
            
  deploy:
-    <<: *defaults
+    working_directory: /tmp/danio-gcc
    steps:
      - attach_workspace:
        at: /tmp/danio-gcc
      - run: |
+            mkdir -pv out
+            find . -name "*.txz" -exec mv -fv {} out \;
+            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