From b8b50684ba0fd638345301d7f2f23190cc510857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 17 Jan 2016 16:19:54 +0100 Subject: [PATCH 1/3] Bump CMakeLists' version to match other places --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 354139be80..23ff43d59d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -230,5 +230,5 @@ install(DIRECTORY data/ DESTINATION share/${PROJECT}) set(CPACK_PACKAGE_VERSION_MAJOR 0) set(CPACK_PACKAGE_VERSION_MINOR 0) -set(CPACK_PACKAGE_VERSION_PATCH "3.1") +set(CPACK_PACKAGE_VERSION_PATCH 4) INCLUDE(CPack) From 80b85d2d2f23ca59efcfc9bc33fb180cec04891c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 17 Jan 2016 16:51:28 +0100 Subject: [PATCH 2/3] Make travis push build artifacts to openrct2.org --- .travis.yml | 23 +++++++++++++---------- scripts/linux/build.sh | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d19f7d53e..136f2465d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,15 @@ dist: trusty matrix: include: - os: linux - env: OPENRCT2_CMAKE_OPTS="-DCMAKE_C_COMPILER=gcc-4.8 -DCMAKE_CXX_COMPILER=g++-4.8" + env: + - OPENRCT2_CMAKE_OPTS="-DCMAKE_C_COMPILER=gcc-4.8 -DCMAKE_CXX_COMPILER=g++-4.8 -DCMAKE_BUILD_TYPE=RelWithDebInfo" + - OPENRCT2_MAKE_OPTS="-j2" + - secure: "S3u2VCE2Vy8KNXoeh+DhnzjCmgTX0r95uEZrXDU+IKANOOCKn7Dg4OFDZE3LY/i1y2/EUDpnR5yLC38Ks795EUP/sv/OoMl4tjQ20yERjqWh+gcIRrgx7SdVabuAh3t4aBdaLD4Pfnj5avxeCt6rL7yGnj0wdbrbJSBZPsgSnuQ=" + after_success: + - cd build + - make package + - mv openrct2*.tar.gz openrct2-linux.tar.gz + - if [[ "z$OPENRCT2_ORG_TOKEN" != "z" ]] ; then curl -o - -v --form "key=$OPENRCT2_ORG_TOKEN" --form "fileName=openrct2-linux.tar.gz" --form "version=0.0.4" --form "gitHash=$TRAVIS_COMMIT" --form "gitBranch=$TRAVIS_BRANCH" --form "flavourId=4" --form "file=@openrct2-linux.tar.gz" "http://openrct2.org/altapi/?command=push-build"; fi - os: linux env: OPENRCT2_CMAKE_OPTS="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++" - os: linux @@ -27,17 +35,12 @@ matrix: - docker - os: osx osx_image: xcode7.2 + env: + - secure: "OXn/i72FxW/oh6RGlaN+gHSbkt1ToFe36etaiDOsJQznt6fe9CpFdnE8U1XBHlGokcEjbGNErRU7CFDKYHQuGrPZyHXwgqG2/0emIqFaFt5ti5ypyYKf5qH9x1LLLfdZxDyHkxXdlJ7Etxbp3G7qrV8CGRQiYRNHm1f98AmuufE=" after_success: - cd build/Release - - hdiutil create -size 64m -fs HFS+ -volname "OpenRCT2 OS X" myimg.dmg - - hdiutil attach myimg.dmg - - export DEVS=$(hdiutil attach myimg.dmg | cut -f 1) - - export DEV=$(echo $DEVS | cut -f 1 -d ' ') - - cp -rv OpenRCT2.app "/Volumes/OpenRCT2 OS X" - - sync - - hdiutil detach $DEV - - hdiutil convert myimg.dmg -format UDZO -o OpenRCT2.dmg - - curl --upload-file OpenRCT2.dmg http://transfer.sh/OpenRCT2.dmg + - zip -r openrct2-osx.zip OpenRCT2.app + - if [[ "z$OPENRCT2_ORG_TOKEN" != "z" ]] ; then curl -o - -v --form "key=$OPENRCT2_ORG_TOKEN" --form "fileName=openrct2-osx.zip" --form "version=0.0.4" --form "gitHash=$TRAVIS_COMMIT" --form "gitBranch=$TRAVIS_BRANCH" --form "flavourId=3" --form "file=@openrct2-osx.zip" "http://openrct2.org/altapi/?command=push-build"; fi # Following entries used to be included in testing, but they only proved useful while changing things in CMake setup. # They are meant to be used when there are changes to CMakeLists.txt # - os: linux diff --git a/scripts/linux/build.sh b/scripts/linux/build.sh index 49d199fb99..edd07ed0a0 100755 --- a/scripts/linux/build.sh +++ b/scripts/linux/build.sh @@ -69,7 +69,7 @@ pushd build # CMAKE and MAKE opts from environment docker run -u travis -v $PARENT:/work/openrct2 -w /work/openrct2/build -i -t openrct2/openrct2:32bit-only bash -c "cmake ../ $OPENRCT2_CMAKE_OPTS && make $OPENRCT_MAKE_OPTS" else - cmake -DCMAKE_BUILD_TYPE=Debug $OPENRCT2_CMAKE_OPTS .. + cmake $OPENRCT2_CMAKE_OPTS .. # NOT the same variable as above make $OPENRCT2_MAKE_OPTS fi From 60ce32bbe068e95bc3db42f5055b61107b1685d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 17 Jan 2016 17:16:43 +0100 Subject: [PATCH 3/3] Make filenames include 8-char git hash and version --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 136f2465d7..e05001d04a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ before_install: sudo: required dist: trusty +env: + - OPENRCT2_VERSION="0.0.4" matrix: include: @@ -20,7 +22,7 @@ matrix: - cd build - make package - mv openrct2*.tar.gz openrct2-linux.tar.gz - - if [[ "z$OPENRCT2_ORG_TOKEN" != "z" ]] ; then curl -o - -v --form "key=$OPENRCT2_ORG_TOKEN" --form "fileName=openrct2-linux.tar.gz" --form "version=0.0.4" --form "gitHash=$TRAVIS_COMMIT" --form "gitBranch=$TRAVIS_BRANCH" --form "flavourId=4" --form "file=@openrct2-linux.tar.gz" "http://openrct2.org/altapi/?command=push-build"; fi + - if [[ "z$OPENRCT2_ORG_TOKEN" != "z" ]] ; then curl -o - -v --form "key=$OPENRCT2_ORG_TOKEN" --form "fileName=openrct2-${OPENRCT2_VERSION}-linux-${TRAVIS_COMMIT:0:8}.tar.gz" --form "version=${OPENRCT2_VERSION}" --form "gitHash=$TRAVIS_COMMIT" --form "gitBranch=$TRAVIS_BRANCH" --form "flavourId=4" --form "file=@openrct2-linux.tar.gz" "http://openrct2.org/altapi/?command=push-build"; fi - os: linux env: OPENRCT2_CMAKE_OPTS="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++" - os: linux @@ -40,7 +42,7 @@ matrix: after_success: - cd build/Release - zip -r openrct2-osx.zip OpenRCT2.app - - if [[ "z$OPENRCT2_ORG_TOKEN" != "z" ]] ; then curl -o - -v --form "key=$OPENRCT2_ORG_TOKEN" --form "fileName=openrct2-osx.zip" --form "version=0.0.4" --form "gitHash=$TRAVIS_COMMIT" --form "gitBranch=$TRAVIS_BRANCH" --form "flavourId=3" --form "file=@openrct2-osx.zip" "http://openrct2.org/altapi/?command=push-build"; fi + - if [[ "z$OPENRCT2_ORG_TOKEN" != "z" ]] ; then curl -o - -v --form "key=$OPENRCT2_ORG_TOKEN" --form "fileName=openrct2-${OPENRCT2_VERSION}-osx-${TRAVIS_COMMIT:0:8}.zip" --form "version=${OPENRCT2_VERSION}" --form "gitHash=$TRAVIS_COMMIT" --form "gitBranch=$TRAVIS_BRANCH" --form "flavourId=3" --form "file=@openrct2-osx.zip" "http://openrct2.org/altapi/?command=push-build"; fi # Following entries used to be included in testing, but they only proved useful while changing things in CMake setup. # They are meant to be used when there are changes to CMakeLists.txt # - os: linux