From 55c9d2fac0e827edf2da5abda9883170517e65fa Mon Sep 17 00:00:00 2001
From: Dagen Brock <dagenbrock@gmail.com>
Date: Mon, 23 Jan 2017 21:26:56 -0600
Subject: [PATCH] test fix for artifact overwrite issue - Linux and OSX have
 same binary artifact name 'gsplus' - I'm testing to see if scripting around
 that name helps - Longer term it's probably better to isolate the builds in
 dirs ...   but keeping some shared assets

---
 .gitlab-ci.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ab6344..10831cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,7 +45,6 @@ build-ubuntu-sdl:
     - make clean ; make
 
 
-
 build-ubuntu-sdl2:
   tags:
     - ubuntu
@@ -55,9 +54,10 @@ build-ubuntu-sdl2:
     - cd src
     - ln -s vars_x86linux_sdl2 vars
     - make clean ; make
+    - mv gsplus gsplus-ubuntu-sdl
   artifacts:
     paths:
-      - gsplus
+      - gsplus-ubuntu-sdl
     expire_in: 5 minutes
 
 package-ubuntu-sdl2:
@@ -68,6 +68,7 @@ package-ubuntu-sdl2:
     - cp src/config.txt .
     - 'echo "# CI_BUILD_ID: $CI_BUILD_ID" >> config.txt'
     - cp COPYING.txt doc/
+    - mv gsplus-ubuntu-sdl gsplus
   artifacts:
     paths:
       - gsplus
@@ -86,9 +87,10 @@ build-osx:
     - cd src
     - ln -s vars_osx_sdl2 vars
     - make clean ; make
+    - mv gsplus gsplus-osx
   artifacts:
     paths:
-      - gsplus
+      - gsplus-osx
     expire_in: 5 minutes
 
 package-osx:
@@ -96,6 +98,7 @@ package-osx:
     - osx
   stage: package
   script:
+    - mv gsplus-osx gsplus
     - cp src/config.txt .
     - 'echo "# CI_BUILD_ID: $CI_BUILD_ID" >> config.txt'
     - chmod +x make_dist_mac.sh