From f7e071444605ec72a6f4577dc7fc63b880d4dd61 Mon Sep 17 00:00:00 2001 From: cbdev Date: Sat, 28 Dec 2019 15:11:26 +0100 Subject: Fix OSX CI --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index bdaf63a..7db9167 100644 --- a/.travis.yml +++ b/.travis.yml @@ -180,7 +180,8 @@ install: before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache ola lua openssl jack; fi +# 'brew install' sometimes returns non-zero for some arcane reason. Executing 'true' resets the exit code and allows Travis to continue building... + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache ola lua openssl jack; true; fi # OpenSSL is not a proper install due to some Apple bull, so provide additional locations via the environment... # Additionally, newer versions of this "recipe" seem to use the name 'openssl@1.1' instead of plain 'openssl' and there seems to be # no way to programmatically get the link and include paths. Genius! Hardcoding the new version for the time being... -- cgit v1.2.3 From e4374c59881032ef644fbb2fd54a554dc4d914b1 Mon Sep 17 00:00:00 2001 From: Spacelord Date: Tue, 31 Dec 2019 00:35:02 +0100 Subject: Automated travis deployment --- .travis-ci.sh | 33 ++++++++++++++++++++++++++++++++- .travis.yml | 10 ++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis-ci.sh b/.travis-ci.sh index da36c17..593b254 100644 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -76,9 +76,40 @@ elif [[ $TASK = 'windows' ]]; then travis_fold start "make_windows" make windows; travis_fold end "make_windows" + + if [ "$(git describe)" == "$(git describe --abbrev=0)" ]; then + mkdir ./deployment + mkdir ./deployment/backends + mkdir ./deployment/docs + cp ./midimonster.exe ./deployment/ + cp ./backends/*.dll ./deployment/backends/ + cp ./monster.cfg ./deployment/monster.cfg + cp ./backends/*.md ./deployment/docs/ + cp -r ./configs ./deployment/ + cd ./deployment + zip -r "./midimonster-$(git describe)-windows.zip" "./" + rm -v !("*.zip") + fi + + else # Otherwise compile as normal travis_fold start "make" make full; + +if [ "$(git describe)" == "$(git describe --abbrev=0)" ]; then + mkdir ./deployment + mkdir ./deployment/backends + mkdir ./deployment/docs + cp ./midimonster ./deployment/ + cp ./backends/*.so ./deployment/backends/ + cp ./monster.cfg ./deployment/monster.cfg + cp ./backends/*.md ./deployment/docs/ + cp -r ./configs ./deployment/ + cd ./deployment + tar czf "midimonster-$(git describe)-linux64.tgz" * + rm -v !("*.tgz") + fi + travis_fold end "make" -fi +fi \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 7db9167..3299c66 100644 --- a/.travis.yml +++ b/.travis.yml @@ -200,3 +200,13 @@ before_install: after_script: - if [ "$TASK" = "coverity" ]; then tail -n 10000 ${TRAVIS_BUILD_DIR}/cov-int/build-log.txt; cat ${TRAVIS_BUILD_DIR}/cov-int/scm_log.txt; fi + +deploy: + provider: releases + api_key: $GITHUB_TOKEN +file: + - "./deployment/*" + skip_cleanup: true + draft: true + on: + tags: true \ No newline at end of file -- cgit v1.2.3 From bbcefdf737452e2fcb4b7703a6348825a2112994 Mon Sep 17 00:00:00 2001 From: Spacelord Date: Tue, 31 Dec 2019 00:42:12 +0100 Subject: fix travis deployment --- .travis.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 3299c66..ea6ffc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -204,9 +204,8 @@ after_script: deploy: provider: releases api_key: $GITHUB_TOKEN -file: - - "./deployment/*" - skip_cleanup: true - draft: true - on: - tags: true \ No newline at end of file + file: ./deployment/* + skip_cleanup: true + draft: true + on: + tags: true \ No newline at end of file -- cgit v1.2.3 From 599430276d4cc7ca3cec27513a5a318fd5e5de25 Mon Sep 17 00:00:00 2001 From: cbdev Date: Tue, 31 Dec 2019 01:53:23 +0100 Subject: Pull tags in CI before build --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index ea6ffc5..6c81d1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,6 @@ addons: - *core_build - mingw-w64 - matrix: fast_finish: true include: @@ -179,6 +178,8 @@ install: - if [ "$TASK" = "codespell" ]; then pip install --user git+https://github.com/codespell-project/codespell.git; fi before_install: +# Travis clones with --branch, which omits tags. Since we use them for the version string at build time, fetch them + - git pull --tags - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi # 'brew install' sometimes returns non-zero for some arcane reason. Executing 'true' resets the exit code and allows Travis to continue building... - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache ola lua openssl jack; true; fi @@ -208,4 +209,4 @@ deploy: skip_cleanup: true draft: true on: - tags: true \ No newline at end of file + tags: true -- cgit v1.2.3 From 87fe68ef7d929b2f79e695df649b374fe0e2c572 Mon Sep 17 00:00:00 2001 From: cbdev Date: Tue, 31 Dec 2019 10:33:29 +0100 Subject: Enable globs for Travis deployments --- .travis.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 6c81d1b..21c2a40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -204,6 +204,7 @@ after_script: deploy: provider: releases + file_glob: true api_key: $GITHUB_TOKEN file: ./deployment/* skip_cleanup: true -- cgit v1.2.3