Bump version to 1.03.01

AmigaPorts · Aug 19, 2022 · 3838b05 · 3838b05
1 parent b2bdf19
commit 3838b05
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -54,7 +54,7 @@ string(TOLOWER ${CMAKE_SYSTEM_NAME} SYSTEM_NAME_LOWER)
 # Version number in format X.YY.ZZ
 set(VER_X  1)
 set(VER_YY 03)
-set(VER_ZZ 00)
+set(VER_ZZ 01)
 set(VER_FULL "${VER_X}.${VER_YY}.${VER_ZZ}")
 
 # Build date Information
@@ -92,7 +92,7 @@ elseif(WIN32)
 elseif(AMIGA)
     set(CPACK_GENERATOR ZIP)
 else()
-    set(CPACK_GENERATOR "TGZ;DEB;RPM")
+    set(CPACK_GENERATOR ZIP)
 endif()
 set(CPACK_PACKAGE_NAME ${PROJECT_NAME_LOWER})
 set(CPACK_PACKAGE_VENDOR "MilkyTracker Team")

diff --git a/JenkinsEnv.json b/JenkinsEnv.json
@@ -7,6 +7,14 @@
             "Dockerfile": "",
             "BuildIfSuccessful": "",
             "BuildParam": "-DM68K_CPU=68040 -DM68K_FPU=hard"
+        },
+        {
+            "DockerRoot": "amigadev",
+            "DockerImage": "crosstools",
+            "DockerTag": "x86_64-linux",
+            "Dockerfile": "",
+            "BuildIfSuccessful": "",
+            "BuildParam": ""
         }
     ]
 }
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -82,16 +82,19 @@ def buildStep(dockerImage, os, flags) {
 					sh "VERBOSE=1 cmake --build . --config Release -- -j${_NPROCESSORS_ONLN}"
 					sh "VERBOSE=1 cmake --build . --config Release --target package -- -j${_NPROCESSORS_ONLN}"
 					def archive_date = sh (
-						script: 'date +"%Y%m%d-%H%M"',
+						script: 'date +"-%Y%m%d-%H%M"',
 						returnStdout: true
 					).trim()
 					def release_type = ("${fixed_job_name}-").replace('/','-').replace('MilkyTracker-','').replace('master-','');
+					if (env.TAG_NAME) {
+						archive_date = '';
+					}
 					dir("milkytracker") {
 						sh "unzip ../*.zip"
 						sh "mv -fv ./* ./MilkyTracker"
 						sh "cp ../../../resources/packaging/amigaos/milkytracker_dir.info ./MilkyTracker.info"
 
-						sh "lha -c ../milkytracker-${os}-${release_type}${archive_date}.lha *"
+						sh "lha -c ../milkytracker-${release_type}${os}${archive_date}.lha *"
 					}
 
 					if (!env.CHANGE_ID) {
@@ -109,7 +112,7 @@ def buildStep(dockerImage, os, flags) {
     					} catch(err) {
 
                     	}
-    					sh "github-release upload --user amigaports --repo milkytracker --tag ${release_type_tag} --name \"milkytracker-${os}-${release_type}${archive_date}.lha\" --file milkytracker-${os}-${release_type}${archive_date}.lha"
+    					sh "github-release upload --user amigaports --repo milkytracker --tag ${release_type_tag} --name \"milkytracker-${release_type}${os}${archive_date}.lha\" --file milkytracker-${release_type}${os}${archive_date}.lha --replace"
 					}
 					archiveArtifacts artifacts: "**.lha"
 					stash includes: "**.lha", name: "${os}"

diff --git a/TODO.md b/TODO.md
@@ -1,3 +1,6 @@
+# General TO-DO
+* Update ChangeLog.html to reflect the changes we've made
+
 # Apollo Core TO-DO
 
 * Variable mix frequency (<=22050 Paula, all on Arne)

diff --git a/platforms/latest/prep.sh b/platforms/latest/prep.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# exit when any command fails
+set -e
+
+#set compiler params
+sudo apt update
+sudo apt install -y libsdl2-dev
+cd "${CURPATH}"