0

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
This commit is contained in:
Andrew Chin
2017-03-12 12:48:27 -04:00
parent d76a22e020
commit b7995efe42

View File

@@ -116,10 +116,11 @@ package:src:
script: script:
- python2 setup.py sdist - python2 setup.py sdist
- ls -lh dist - ls -lh dist
- mv dist/*.tar.gz .
artifacts: artifacts:
expire_in: 2 weeks expire_in: 2 weeks
paths: paths:
- dist/*.tar.gz - Minecraft-Overviewer*.tar.gz
package:centos7rpm: package:centos7rpm:
image: code.em32.net:14567/overviewer/minecraft-overviewer:centos7 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 - 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 - ci_env\Scripts\sphinx-build.exe docs dist\overviewer-%OVR_VERSION%\docs
- rename dist dist-win64 - rename dist dist-win64
- ci_env\Scripts\python.exe -m zipfile -c overviewer-win64-%OVR_VERSION%.zip dist-win64\overviewer-%OVR_VERSION%\
artifacts: artifacts:
expire_in: 2 weeks expire_in: 2 weeks
paths: paths:
- dist-win64/* - overviewer-win64-*.zip
package:win32: package:win32:
stage: package 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 - 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 - ci_env\Scripts\sphinx-build.exe docs dist\overviewer-%OVR_VERSION%\docs
- rename dist dist-win32 - rename dist dist-win32
- ci_env\Scripts\python.exe -m zipfile -c overviewer-win32-%OVR_VERSION%.zip dist-win32\overviewer-%OVR_VERSION%\
artifacts: artifacts:
expire_in: 2 weeks expire_in: 2 weeks
paths: paths:
- dist-win32 - overviewer-win32-*.zip
verify:centos7: verify:centos7:
image: code.em32.net:14567/overviewer/minecraft-overviewer:centos7-verify 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/ - mkdir -p /builds/$CI_BUILD_REF_SLUG/$CI_BUILD_ID/
- mv *.deb /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 *.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/