From c7e688d9e6ef501cf26aa4dab13f072da910a55e Mon Sep 17 00:00:00 2001 From: woblight Date: Tue, 17 Jul 2018 15:37:29 +0200 Subject: [PATCH] CI: Place artifacts in a folder with a nice name --- .gitlab-ci.yml | 4 ++-- CI.mk | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7a4c42..509c5ab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ Linux_x64: - make -f CI.mk build artifacts: paths: - - build/GitAddonsManager + - GitAddonsManager name: "Linux_x64" Win32: @@ -26,5 +26,5 @@ Win32: - make -f CI.mk windeploy artifacts: paths: - - build_win32/deploy/* + - GitAddonsManager name: "Win32" diff --git a/CI.mk b/CI.mk index 491c1e6..c94e36d 100644 --- a/CI.mk +++ b/CI.mk @@ -12,7 +12,7 @@ qmake=$(wine) $(pwd)/Qt/5.11.1/mingw53_32/bin/qmake.exe .PHONY: build build: - mkdir -p build && cd build && qmake-qt5 .. -spec linux-g++ && make + mkdir -p GitAddonsManager && cd GitAddonsManager && qmake-qt5 .. -spec linux-g++ && make cmake-3.12.0-rc3-win32-x86.msi: wget https://cmake.org/files/v3.12/cmake-3.12.0-rc3-win32-x86.msi @@ -83,9 +83,9 @@ winbuild: build_win32/GitAddonsManager.exe build_win32/release/GitAddonsManager.exe: winbuild windeploy: build_win32/release/GitAddonsManager.exe libgit2-0.27.2/build/libgit2.dll - mkdir -p build_win32/deploy/ - cp libgit2-0.27.2/build/libgit2.dll -f build_win32/deploy/libgit2.dll - cp build_win32/release/GitAddonsManager.exe -f build_win32/deploy/ + mkdir -p GitAddonsManager/ + cp libgit2-0.27.2/build/libgit2.dll -f GitAddonsManager/libgit2.dll + cp build_win32/release/GitAddonsManager.exe -f GitAddonsManager/ mkdir -p tmpqmls && cp -f *.qml tmpqmls/ - $(wine) Qt/5.11.1/mingw53_32/bin/windeployqt.exe --qmldir tmpqmls build_win32/deploy/GitAddonsManager.exe + $(wine) Qt/5.11.1/mingw53_32/bin/windeployqt.exe --qmldir tmpqmls GitAddonsManager/GitAddonsManager.exe rm -fr tmpqmls