From b7995efe4211841ae1f6df267033e84612293a88 Mon Sep 17 00:00:00 2001
From: Andrew Chin <achin@eminence32.net>
Date: Sun, 12 Mar 2017 12:48:27 -0400
Subject: [PATCH] Be more consistant in build artifact naming

Instead of having a directory of files for dist-win32 and dist-win64,
create a zipfile named like overviewer-win64-0.12.345.zip
---
 .gitlab-ci.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e77159..9a438b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -116,10 +116,11 @@ package:src:
   script:
     - python2 setup.py sdist
     - ls -lh dist
+    - mv dist/*.tar.gz .
   artifacts:
     expire_in: 2 weeks
     paths:
-      - dist/*.tar.gz
+      - Minecraft-Overviewer*.tar.gz
 
 package:centos7rpm:
   image: code.em32.net:14567/overviewer/minecraft-overviewer:centos7
@@ -234,10 +235,11 @@ package:win64:
     - for /f "delims=" %%a in ('ci_env\Scripts\python.exe setup.py --version') do @set OVR_VERSION=%%a
     - ci_env\Scripts\sphinx-build.exe docs dist\overviewer-%OVR_VERSION%\docs
     - rename dist dist-win64
+    - ci_env\Scripts\python.exe -m zipfile -c overviewer-win64-%OVR_VERSION%.zip dist-win64\overviewer-%OVR_VERSION%\
   artifacts:
     expire_in: 2 weeks
     paths:
-      - dist-win64/*
+      - overviewer-win64-*.zip
 
 package:win32:
   stage: package
@@ -257,10 +259,11 @@ package:win32:
     - for /f "delims=" %%a in ('ci_env\Scripts\python.exe setup.py --version') do @set OVR_VERSION=%%a
     - ci_env\Scripts\sphinx-build.exe docs dist\overviewer-%OVR_VERSION%\docs
     - rename dist dist-win32
+    - ci_env\Scripts\python.exe -m zipfile -c overviewer-win32-%OVR_VERSION%.zip dist-win32\overviewer-%OVR_VERSION%\
   artifacts:
     expire_in: 2 weeks
     paths:
-      - dist-win32
+      - overviewer-win32-*.zip
 
 verify:centos7:
   image: code.em32.net:14567/overviewer/minecraft-overviewer:centos7-verify
@@ -336,4 +339,5 @@ deploy:builds:
     - mkdir -p /builds/$CI_BUILD_REF_SLUG/$CI_BUILD_ID/
     - mv *.deb /builds/$CI_BUILD_REF_SLUG/$CI_BUILD_ID/
     - mv *.rpm /builds/$CI_BUILD_REF_SLUG/$CI_BUILD_ID/
-    - mv dist* /builds/$CI_BUILD_REF_SLUG/$CI_BUILD_ID/
+    - mv overviewer*.zip /builds/$CI_BUILD_REF_SLUG/$CI_BUILD_ID/
+    - echo Artifacts copied to http://static-backend.overviewer.org/builds/$CI_BUILD_REF_SLUG/$CI_BUILD_ID/