Skip to content

Commit 3838b05

Browse files
committed
Bump version to 1.03.01
1 parent b2bdf19 commit 3838b05

5 files changed

Lines changed: 28 additions & 5 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ string(TOLOWER ${CMAKE_SYSTEM_NAME} SYSTEM_NAME_LOWER)
5454
# Version number in format X.YY.ZZ
5555
set(VER_X 1)
5656
set(VER_YY 03)
57-
set(VER_ZZ 00)
57+
set(VER_ZZ 01)
5858
set(VER_FULL "${VER_X}.${VER_YY}.${VER_ZZ}")
5959

6060
# Build date Information
@@ -92,7 +92,7 @@ elseif(WIN32)
9292
elseif(AMIGA)
9393
set(CPACK_GENERATOR ZIP)
9494
else()
95-
set(CPACK_GENERATOR "TGZ;DEB;RPM")
95+
set(CPACK_GENERATOR ZIP)
9696
endif()
9797
set(CPACK_PACKAGE_NAME ${PROJECT_NAME_LOWER})
9898
set(CPACK_PACKAGE_VENDOR "MilkyTracker Team")

JenkinsEnv.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@
77
"Dockerfile": "",
88
"BuildIfSuccessful": "",
99
"BuildParam": "-DM68K_CPU=68040 -DM68K_FPU=hard"
10+
},
11+
{
12+
"DockerRoot": "amigadev",
13+
"DockerImage": "crosstools",
14+
"DockerTag": "x86_64-linux",
15+
"Dockerfile": "",
16+
"BuildIfSuccessful": "",
17+
"BuildParam": ""
1018
}
1119
]
1220
}

Jenkinsfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,19 @@ def buildStep(dockerImage, os, flags) {
8282
sh "VERBOSE=1 cmake --build . --config Release -- -j${_NPROCESSORS_ONLN}"
8383
sh "VERBOSE=1 cmake --build . --config Release --target package -- -j${_NPROCESSORS_ONLN}"
8484
def archive_date = sh (
85-
script: 'date +"%Y%m%d-%H%M"',
85+
script: 'date +"-%Y%m%d-%H%M"',
8686
returnStdout: true
8787
).trim()
8888
def release_type = ("${fixed_job_name}-").replace('/','-').replace('MilkyTracker-','').replace('master-','');
89+
if (env.TAG_NAME) {
90+
archive_date = '';
91+
}
8992
dir("milkytracker") {
9093
sh "unzip ../*.zip"
9194
sh "mv -fv ./* ./MilkyTracker"
9295
sh "cp ../../../resources/packaging/amigaos/milkytracker_dir.info ./MilkyTracker.info"
9396

94-
sh "lha -c ../milkytracker-${os}-${release_type}${archive_date}.lha *"
97+
sh "lha -c ../milkytracker-${release_type}${os}${archive_date}.lha *"
9598
}
9699

97100
if (!env.CHANGE_ID) {
@@ -109,7 +112,7 @@ def buildStep(dockerImage, os, flags) {
109112
} catch(err) {
110113

111114
}
112-
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"
115+
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"
113116
}
114117
archiveArtifacts artifacts: "**.lha"
115118
stash includes: "**.lha", name: "${os}"

TODO.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# General TO-DO
2+
* Update ChangeLog.html to reflect the changes we've made
3+
14
# Apollo Core TO-DO
25

36
* Variable mix frequency (<=22050 Paula, all on Arne)

platforms/latest/prep.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
3+
# exit when any command fails
4+
set -e
5+
6+
#set compiler params
7+
sudo apt update
8+
sudo apt install -y libsdl2-dev
9+
cd "${CURPATH}"

0 commit comments

Comments
 (0)