[gjs: 2/4] CI: fix to properly save log on artifacts

[Gitlab Administrative User <gitlab src gnome org>]

commit b492dd8f366f0e7a4cbba52e22dc223cf5c1428f
Author: Claudio André <claudioandre br gmail com>
Date:   Tue Oct 31 09:56:20 2017 -0200

    CI: fix to properly save log on artifacts

 .gitlab-ci.yml  | 21 ++++++---------------
 test/test-ci.sh | 12 +++++++-----
 2 files changed, 13 insertions(+), 20 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c6352ea..11912d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,33 +6,24 @@ stages:
 - cleanup
 
 before_script:
-  - cd ..
   - ln -s $(pwd) /cwd
+  - ln -s $(dirname $(pwd)) /hoard
 
 .build: &build
   stage: build
   artifacts:
     when: always
     paths:
-    - $(pwd)/logFile
+    - $(pwd)/.cache/jhbuild/build/gjs/test-suite.log
 
   script:
-    # Clean the build machine
-    - rm -rf jhbuild/
-    - rm -rf .cache/
-
-    # Make the log File accessible
-    - mkdir -p .cache/jhbuild/build/gjs
-    - touch .cache/jhbuild/build/gjs/test-suite.log
-    - ln -f .cache/jhbuild/build/gjs/test-suite.log $(pwd)/gjs/logFile
-
     # Build and test GJS
-    - 'if [[ -d "$(pwd)/SAVED/$OS/jhbuild" ]]; then
-         $(pwd)/gjs/test/test-ci.sh GET_FILES;
+    - 'if [[ -d "/hoard/SAVED/$OS/jhbuild" ]]; then
+         $(pwd)/test/test-ci.sh GET_FILES;
        else
-         $(pwd)/gjs/test/test-ci.sh BUILD_MOZ;
+         $(pwd)/test/test-ci.sh BUILD_MOZ;
        fi'
-    - $(pwd)/gjs/test/test-ci.sh GJS
+    - $(pwd)/test/test-ci.sh GJS
 
 ubuntu_gcc:
   <<: *build
diff --git a/test/test-ci.sh b/test/test-ci.sh
index a8c6a0f..fe21793 100755
--- a/test/test-ci.sh
+++ b/test/test-ci.sh
@@ -136,6 +136,8 @@ function do_Build_JHBuild(){
     if [[ $1 == "RESET" ]]; then
         git reset --hard HEAD
     fi
+    echo '-- Done --'
+    cd -
 }
 
 function do_Build_Mozilla(){
@@ -161,10 +163,10 @@ function do_Build_Package_Dependencies(){
 function do_Save_Files(){
     echo
     echo '-- Saving build files --'
-    mkdir -p "/cwd/SAVED/$OS"
+    mkdir -p "/hoard/SAVED/$OS"
 
-    cp -r ~/jhbuild "/cwd/SAVED/$OS/jhbuild"
-    cp -r ~/.local  "/cwd/SAVED/$OS/.local"
+    cp -r ~/jhbuild "/hoard/SAVED/$OS/jhbuild"
+    cp -r ~/.local  "/hoard/SAVED/$OS/.local"
     echo '-- Done --'
 }
 
@@ -172,8 +174,8 @@ function do_Get_Files(){
     echo
     echo '-- Restoring build files --'
 
-    cp -r "/cwd/SAVED/$OS/jhbuild" ~/jhbuild
-    cp -r "/cwd/SAVED/$OS/.local"  ~/.local
+    cp -r "/hoard/SAVED/$OS/jhbuild" ~/jhbuild
+    cp -r "/hoard/SAVED/$OS/.local"  ~/.local
     echo '-- Done --'
 }