From 10415040991e81875b6a4d167af4600d90568bd0 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Mon, 28 May 2018 13:11:22 +0100
Subject: [PATCH 1/3] ci: Export meson-logs from msys2-mingw32 build as
 artifacts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This means that compilation and test failures will leave logs on the CI
machines which we can use to debug the failures.

Always export the artifacts. The default `when: on_success` is
appropriate for now, but won’t be in future when the tests actual report
their success value correctly.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ccee2ed0c..51e0b35e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,9 @@ msys2-mingw32:
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20
     - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
   artifacts:
+    when: always
     paths:
+      - _build/meson-logs
       - _coverage/
 
 vs2017-x64:

From a53d74e0788f3eb9917389cebf86752785dfce04 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Tue, 29 May 2018 10:53:41 +0100
Subject: [PATCH 2/3] ci: Always export artifacts from Fedora build

The default `when: on_success` means no artifacts are exported when the
tests fail, which is precisely when we want to see the artifacts.

Always export them, and rely on GitLab to garbage collect them as
appropriate (typically after 30 days, I think).

Signed-off-by: Philip Withnall <withnall@endlessm.com>
---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 51e0b35e5..cd202a0b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,6 +28,7 @@ fedora-meson-x86_64:
     - tags
   artifacts:
     name: "glib-_${CI_COMMIT_REF_NAME}"
+    when: always
     paths:
       - "${CI_PROJECT_DIR}/_build/meson-logs"
       - "${CI_PROJECT_DIR}/_coverage"

From 91208e8d3f4c1a1e7a9dda45b6e4e8c437b578c0 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Tue, 29 May 2018 10:54:29 +0100
Subject: [PATCH 3/3] ci: Clarify artifact naming

Put the job name and commit identifier in the artifact names.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
---
 .gitlab-ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd202a0b0..003389b4b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ fedora-meson-x86_64:
   except:
     - tags
   artifacts:
-    name: "glib-_${CI_COMMIT_REF_NAME}"
+    name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
     when: always
     paths:
       - "${CI_PROJECT_DIR}/_build/meson-logs"
@@ -44,6 +44,7 @@ msys2-mingw32:
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu --ask 20
     - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
   artifacts:
+    name: "glib-%CI_JOB_NAME%-%CI_COMMIT_REF_NAME%"
     when: always
     paths:
       - _build/meson-logs
@@ -56,6 +57,7 @@ vs2017-x64:
   script:
     - .gitlab-ci/test-msvc.bat
   artifacts:
+    name: "glib-%CI_JOB_NAME%-%CI_COMMIT_REF_NAME%"
     when: always
     paths:
       - _build/meson-logs
@@ -63,6 +65,7 @@ vs2017-x64:
 coverage:
   stage: coverage
   artifacts:
+    name: "glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
     paths:
       - _coverage/
   script: