armv8: Improve readability of register restoration code

[barrelfish] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d2db03..5fa7e52 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,8 +10,8 @@
 
 stages:
   - commithooks
-  # - hake
-  # - build
+  - hake
+  - build
   # - tests
 
 
@@ -20,24 +20,74 @@ stages:
 commithook-signedoff:
   stage: commithooks
   image: achreto/barrelfish-ci
-  artifacts :
-    paths:
-      - commits_not_signed.txt
   script:
-    - "! git log  --since='2017-01-01' --invert-grep --grep='Signed-off-by' | tee 'commits_not_signed.txt' | grep 'commit' -A 5"
-    
+    - "! git log  --since='2018-01-01' --invert-grep --grep='Signed-off-by' 
+        | tee 'commits_not_signed.txt' | grep 'commit' -A 5"
 
+commithook-merged:
+  stage: commithooks
+  image: achreto/barrelfish-ci
+  script:
+    - "! grep -r '^<<<<<<< '"
 
-# x86:hake:
-#   stage: hake
-#   image: achreto/barrelfish-ci
-#   artifacts:
-#     paths:
-#       - build-x86
-#     when: on_success
-#   script:
-#     - "mkdir build-x86; (cd build-x86 && ../hake/hake.sh -s ../ -a x86_64)"
     
+##############################################################################
+
+hake-tool:
+  stage: hake
+  image: achreto/barrelfish-ci
+  script:
+    - "mkdir build; (cd build && ../hake/hake.sh --no-hake -s ../ -a x86_64)"
+
+hake-files:
+  stage: hake
+  image: achreto/barrelfish-ci
+  script:
+    - "mkdir build; (cd build && ../hake/hake.sh --no-deps -s ../ -a x86_64)"    
+
+##############################################################################
+
+
+build-x86:
+  stage: build
+  image: achreto/barrelfish-ci
+  artifacts:
+    paths:
+      - build-x86.log
+    when: on_failure
+  script:
+    - "mkdir build-x86; 
+       (cd build-x86 && ../hake/hake.sh -s ../ -a x86_64 && make X86_64_Basic -j4 > ../build.log);
+       rm -rf build-x86"
+
+
+build-armv7:
+  stage: build
+  image: achreto/barrelfish-ci
+  artifacts:
+    paths:
+      - build-armv7.log
+    when: on_failure
+  script:
+    - "mkdir build-armv7; 
+       (cd build-armv7 && ../hake/hake.sh -s ../ -a armv7 && make ARMV7_Basic -j4 > ../build-armv7.log);
+       rm -rf build-armv7"
+
+
+build-armv8:
+  stage: build
+  image: achreto/barrelfish-ci
+  artifacts:
+    paths:
+      - build-armv8.log
+    when: on_failure
+  script:
+    - "mkdir build-armv8; 
+       (cd build-armv8 && ../hake/hake.sh -s ../ -a armv8 && make ARMV8_Basic -j4  > ../build-armv8.log);
+       rm -rf build-armv8;"
+
+
+##############################################################################
 
 # x86:build:
 #   stage: build