From 484846786ecf19c9c22794fe81d922af025ab4a4 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Sun, 4 Oct 2020 10:02:10 +0100 Subject: Fix macOS code signing and setup automatic nightly builds (#990) Co-authored-by: Travis CI Co-authored-by: vantezzen --- .travis.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index a120aae49..43e7fda20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,20 @@ cache: npm before_install: - git submodule update --init --recursive + - | + if [ $TRAVIS_BRANCH == "nightly" ]; then + git remote add source https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 + git fetch source + git merge --no-ff --commit --no-edit source/develop + changes=$(git diff --stat HEAD origin/nightly | wc -l) + if [ $changes -eq 0 ]; then + travis_terminate 0; + else + git submodule update --remote --force + git add . + git commit -m "Update submodules" + fi + fi install: - cd recipes && npm install && npm run package && cd .. - travis_retry npx lerna bootstrap @@ -40,7 +54,7 @@ script: fi - | if [ $TRAVIS_BRANCH == "nightly" ]; then - npm version prerelease --preid=nightly -m "%s [skip ci]" + npm version prerelease --preid=nightly -m "%s and trigger AppVeyor nightly build [skip travisci]" travis_retry travis_wait 100 npm run build -- --publish always -c.publish.provider=github -c.publish.owner=getferdi -c.publish.repo=nightlies if [ $TRAVIS_OS_NAME == "osx" ]; then git remote add nightly https://${GH_TOKEN}@github.com/getferdi/ferdi.git > /dev/null 2>&1 -- cgit v1.2.3-70-g09d2