Build scripts fixup.

danielga · Mar 2, 2018 · ac5876b · ac5876b
1 parent 8e3262e
commit ac5876b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ job_win32:
   script: "& \"$CI_PROJECT_DIR/ci.ps1\""
   artifacts:
     paths:
-      - "gmsv_${MODULE_NAME}_win32.dll"
+      - "$CI_PROJECT_DIR/projects/windows/vs2017/release/gmsv_${MODULE_NAME}_win32.dll"
 job_linux:
   stage: build
   tags:
@@ -30,12 +30,12 @@ job_linux:
     PROJECT_OS: "linux"
     TARGET_OS: "linux"
     PREMAKE5: "$CI_PROJECT_DIR/dependencies/linux/premake-core/premake5"
-    CXX: "g++-4.9"
-    CC: "gcc-4.9"
+    CXX: "g++-4.8"
+    CC: "gcc-4.8"
   script: "$CI_PROJECT_DIR/ci.sh"
   artifacts:
     paths:
-      - "gmsv_${MODULE_NAME}_linux.dll"
+      - "$CI_PROJECT_DIR/projects/linux/gmake/release/gmsv_${MODULE_NAME}_linux.dll"
 job_macosx:
   stage: build
   tags:
@@ -51,4 +51,4 @@ job_macosx:
   script: "$CI_PROJECT_DIR/ci.sh"
   artifacts:
     paths:
-      - "gmsv_${MODULE_NAME}_osx.dll"
+      - "$CI_PROJECT_DIR/projects/macosx/gmake/release/gmsv_${MODULE_NAME}_osx.dll"
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ os:
   - linux
   - osx
 osx_image: xcode7.3
+if: tag IS present
 cache:
   directories:
     - "$TRAVIS_BUILD_DIR/dependencies"
@@ -40,7 +41,7 @@ script: "$TRAVIS_BUILD_DIR/ci.sh"
 deploy:
   provider: releases
   skip_cleanup: true
-  file: "gmsv_${MODULE_NAME}_$TARGET_OS.dll"
+  file: "$TRAVIS_BUILD_DIR/projects/$PROJECT_OS/gmake/release/gmsv_${MODULE_NAME}_${TARGET_OS}.dll"
   on:
     tags: true
   api_key:

diff --git a/ci.ps1 b/ci.ps1
@@ -73,5 +73,4 @@ cd "$env:REPOSITORY_DIR/projects/windows/vs2017"
 
 msbuild "$env:MODULE_NAME.sln" /p:Configuration=Release
 
-cp "$env:REPOSITORY_DIR/projects/windows/vs2017/release/gm*_${env:MODULE_NAME}_win32.dll" "$env:REPOSITORY_DIR"
 cd "$env:REPOSITORY_DIR"
diff --git a/ci.sh b/ci.sh
@@ -53,5 +53,4 @@ cd "$REPOSITORY_DIR/projects/$PROJECT_OS/gmake"
 
 make
 
-cp "$REPOSITORY_DIR/projects/$PROJECT_OS/gmake/release/"gm*_${MODULE_NAME}_$TARGET_OS.dll "$REPOSITORY_DIR"
 cd "$REPOSITORY_DIR"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -73,5 +73,4 @@ cd "$env:REPOSITORY_DIR/projects/windows/vs2017"

		msbuild "$env:MODULE_NAME.sln" /p:Configuration=Release

		cp "$env:REPOSITORY_DIR/projects/windows/vs2017/release/gm*_${env:MODULE_NAME}_win32.dll" "$env:REPOSITORY_DIR"
		cd "$env:REPOSITORY_DIR"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -53,5 +53,4 @@ cd "$REPOSITORY_DIR/projects/$PROJECT_OS/gmake"

		make

		cp "$REPOSITORY_DIR/projects/$PROJECT_OS/gmake/release/"gm*_${MODULE_NAME}_$TARGET_OS.dll "$REPOSITORY_DIR"
		cd "$REPOSITORY_DIR"