Merge feature/ci-artifact-upload (#78)

* Test CI upload

* Update compose and travis script

* Fix .travis.yml indentation

* Fix install_data buildaction on Linux

* Tell AppVeyor to upload the artifacts

* Fix syntax error

* Fix syntax error (2)

* Fix syntax errors (3)

* Fix artifact zip not being available

* Addendum to previous commit

* I'm an idiot

* Enable optimization for CI builds and fix launcher not being included
Also remove publicsdk from artifact upload

* Strip symbols in CI builds to get smaller binaries

* Fix skins not being copied correctly

* Update CI URL and secrets

Author: Jusonex

.travis.yml

@@ -9,6 +9,7 @@ addons:
     packages:
     - gcc-5
     - g++-5
+    - zip
     env: COMPILER=g++-5
 
 before_script:
@@ -18,10 +19,22 @@ before_script:
   - cd Build
 
 script: make -j 3 CXX=g++-5 CC=gcc-5 config=release_x64
- 
+
+after_success:
+  - cd ..
+  - ./premake5 install_data
+  - ./premake5 compose_files
+  - zip -r Artifact.zip InstallFiles/
+  - curl -i -F "branch_name=$TRAVIS_BRANCH" -F "commit_hash=$TRAVIS_COMMIT" -F "commit_title=$(git log -1 --pretty=%B)" -F build_type=linux64 -F "secret=$UPLOAD_SECRET" -F build_upload=@Artifact.zip https://nightlytest.mtasa.com/api/upload
+
 notifications:
   irc:
     channels:
       - "irc.gtanet.com#mta.dev"
     on_success: change
     on_failure: always
+
+env:
+  matrix:
+      secure: fk2kDz4BD3S4cuUihwn7D+rr8X0ZGltahpYJfZzCL5teSJmwIuJOprlsP92x9eacWLzbOdy1cQxj6FfVIeRxiy2hdyx1q+tloA1i7v+rQmErxzPEkSMMJ2dHemUvG5FzfvH5ZzUarFBZwezIxI78eTs5JLBcwoAVMVIJumoqGqI=
+

appveyor.yml

@@ -11,6 +11,8 @@ before_build:
 after_build:
   - utils\premake5 install_data
   - utils\premake5 compose_files
+  - 7z a InstallFiles.zip InstallFiles
+  - cmd: if not %UPLOAD_SECRET% == "" curl -i -F "branch_name=%APPVEYOR_REPO_BRANCH%" -F "commit_hash=%APPVEYOR_REPO_COMMIT%" -F "commit_title=%APPVEYOR_REPO_COMMIT_MESSAGE%" -F build_type=windows32 -F "secret=%UPLOAD_SECRET%" -F build_upload=@InstallFiles.zip https://nightlytest.mtasa.com/api/upload
 
 clone_depth: 1
 
@@ -24,5 +26,9 @@ notifications:
       secure: GMy2h7KrBeqM46INusj3AEZvef5jyFQRUeKqcJjfttHc/Iujje6YN398t7mo5UeMZjkDN2azgcb/R79wU/BvJot8iiu/4AtEBGwLffzrpCw=
 
 artifacts:
-  - path: InstallFiles
+  - path: InstallFiles.zip
     name: MTASA
+
+environment:
+  UPLOAD_SECRET:
+    secure: 5PjW2ChD6CvgnKi1T4d19cV6cX8SN6d8N/keVeszzmQ=

premake5.lua

@@ -50,13 +50,15 @@ workspace "MTASA"
 		defines { "MTA_DEBUG" }
 		targetsuffix "_d"
 
-	if not CI_BUILD then
-		-- Only optimize outside of CI Builds
-		filter "configurations:Release or configurations:Nightly"
-			flags { "Optimize" }
-	else
+	filter "configurations:Release or configurations:Nightly"
+		flags { "Optimize" }
+	
+	if CI_BUILD then
 		filter {}
 			defines { "CI_BUILD=1" }
+		
+		filter { "system:linux" }
+			linkoptions { "-s" }
 	end 
 
 	filter {"system:windows", "configurations:Nightly", "kind:not StaticLib"}

utils/buildactions/compose_files.lua

@@ -6,6 +6,7 @@ premake.modules.compose_files = {}
 local BIN_DIR = "Bin"
 local DATA_DIR = "Shared/data/MTA San Andreas"
 local OUTPUT_DIR = "InstallFiles"
+local WINDOWS = os.get() == "windows"
 
 newaction {
 	trigger = "compose_files",
@@ -15,22 +16,29 @@ newaction {
 		os.mkdir(OUTPUT_DIR)
 
 		-- Copy data files
-		os.copydir(DATA_DIR.."/MTA", OUTPUT_DIR.."/MTA")
-		os.copydir(DATA_DIR.."/skins/Classic", OUTPUT_DIR.."/skins/Default", "*.xml")
-		os.copydir(DATA_DIR.."/server/mods/deathmatch", OUTPUT_DIR.."/server/mods/deathmatch", "*.dll")
-		os.copydir(DATA_DIR.."/redist", OUTPUT_DIR.."/redist")
-		
+		if WINDOWS then
+			os.copydir(DATA_DIR.."/MTA", OUTPUT_DIR.."/MTA")
+			os.copydir(DATA_DIR.."/skins", OUTPUT_DIR.."/skins")
+			os.copydir(DATA_DIR.."/server/mods/deathmatch", OUTPUT_DIR.."/server/mods/deathmatch", "*.dll")
+			os.copydir(DATA_DIR.."/redist", OUTPUT_DIR.."/redist")
+		end
+
 		-- Copy configs
 		os.copydir("Server/mods/deathmatch", OUTPUT_DIR.."/server/mods/deathmatch", "*.conf")
 		os.copydir("Server/mods/deathmatch", OUTPUT_DIR.."/server/mods/deathmatch", "*.xml")
 
 		-- Copy compiled binaries
-		os.copydir(BIN_DIR, OUTPUT_DIR, "**.exe")
-		os.copydir(BIN_DIR, OUTPUT_DIR, "**.dll")
-		os.copydir(BIN_DIR, OUTPUT_DIR, "**.pak")
-		
+		if WINDOWS then
+			os.copydir(BIN_DIR, OUTPUT_DIR, "**.exe")
+			os.copydir(BIN_DIR, OUTPUT_DIR, "**.dll")
+			os.copydir(BIN_DIR, OUTPUT_DIR, "**.pak")
+		else
+			os.copydir(BIN_DIR, OUTPUT_DIR, "**.so")
+			os.copydir(BIN_DIR, OUTPUT_DIR, "**mta-server*")
+		end
+
 		-- Copy publicsdk
-		os.copydir("Shared/publicsdk", OUTPUT_DIR.."/development/publicsdk")
+		-- os.copydir("Shared/publicsdk", OUTPUT_DIR.."/development/publicsdk")
 	end
 }
 

utils/buildactions/install_data.lua

@@ -23,8 +23,10 @@ newaction {
 		os.mkdir(BIN_DIR)
 
 		-- Copy data files
-		os.copydir(DATA_DIR, BIN_DIR)
-		
+		if os.get() == "windows" then
+			os.copydir(DATA_DIR, BIN_DIR)
+		end
+
 		-- Copy configs
 		os.copydir("Server/mods/deathmatch", BIN_DIR.."/server/mods/deathmatch", "*.conf")
 		os.copydir("Server/mods/deathmatch", BIN_DIR.."/server/mods/deathmatch", "*.xml")