From 74d3eb1b2cf7d677aa16445b34e2afa1a2b454b2 Mon Sep 17 00:00:00 2001 From: Han Joosten Date: Sat, 27 Oct 2018 13:09:35 +0200 Subject: [PATCH 1/5] use names for jobs in matix --- .travis.yml | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a6088dc94..2ec886d569 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,24 +30,28 @@ matrix: include: # The Stack builds. We can pass in arbitrary Stack arguments via the ARGS # variable, such as using --stack-yaml to point to a different file. - - env: BUILD=stack STACK_YAML=stack.yaml + - name: "linux, stack" + env: BUILD=stack STACK_YAML=stack.yaml compiler: ": #stack" addons: {apt: {packages: [ ] ,sources: [hvr-ghc]}} - - env: BUILD=stack STACK_YAML=stack.yaml osx + - name: "osx, stack" + env: BUILD=stack STACK_YAML=stack.yaml osx compiler: ": #stack" os: osx # We grab the appropriate GHC and cabal-install versions from hvr's PPA. See: # https://github.com/hvr/multi-ghc-travis - - env: BUILD=cabal GHCVER=8.4.3 CABALVER=2.2 + - name: "linux, cabal" + env: BUILD=cabal GHCVER=8.4.3 CABALVER=2.2 compiler: ": #GHC 8.4.3" addons: {apt: {packages: [ cabal-install-2.2.0.1 , ghc-8.4.3 ] ,sources: [hvr-ghc]}} - - env: BUILD=cabal GHCVER=8.4.3 CABALVER=2.2 osx + - name: "osx, cabal" + env: BUILD=cabal GHCVER=8.4.3 CABALVER=2.2 osx compiler: ": #GHC 8.4.3" addons: {apt: {packages: [ cabal-install-2.2.0.1 , ghc-8.4.3 @@ -56,28 +60,30 @@ matrix: os: osx # Build with the newest GHC and cabal-install. - - env: BUILD=cabal GHCVER=head CABALVER=head + - name: "linux, cabal, latest" + env: BUILD=cabal GHCVER=head CABALVER=head compiler: ": #GHC HEAD" addons: {apt: {packages: [ cabal-install-head , ghc-head ] ,sources: [hvr-ghc]}} - - env: BUILD=stack ARGS="--resolver nightly" + - name: "linux, stack, latest" + env: BUILD=stack ARGS="--resolver nightly" compiler: ": #stack nightly" addons: {apt: {packages: [libgmp-dev]}} allow_failures: # Temporarily, because cabal does not build, but stack does - - env: BUILD=cabal GHCVER=8.4.3 CABALVER=2.2 + - name: "linux, cabal" # Nightly builds are allowed to fail - - env: BUILD=stack ARGS="--resolver nightly" - - env: BUILD=cabal GHCVER=head CABALVER=head + - name: "linux, stack, latest" + - name: "linux, cabal, latest" # OSX builds currently (sept 2016) do not work, because PHP isn't available - - env: BUILD=stack STACK_YAML=stack.yaml osx - - env: BUILD=cabal GHCVER=8.4.3 CABALVER=2.2 osx + - name: "osx, stack" + - name: "osx, cabal" From 2d89a895197e3e22da6ac4152e6070920306f693 Mon Sep 17 00:00:00 2001 From: Han Joosten Date: Sat, 27 Oct 2018 15:20:52 +0200 Subject: [PATCH 2/5] create tag by travis --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2ec886d569..9663f92207 100644 --- a/.travis.yml +++ b/.travis.yml @@ -152,13 +152,19 @@ script: # Run weeder, to check that there are no weeds (see https://github.com/ndmitchell/weeder ) # - curl -sL https://raw.github.com/ndmitchell/weeder/master/misc/travis.sh | sh -s . +before_deploy: + # tag this commit + - AMPERSAND_VERSION=`stack exec -- ampersand -v | sed 's/ .*//'` + - git tag '$(AMPERSAND_VERSION)' + deploy: provider: releases skip_cleanup: true file: dist/ampersand on: repo: AmpersandTarski/Ampersand - tags: true + branch: cicd + tags: false condition: $BUILD = stack api-key: secure: ctc+qaMBb9wnQt9827grVDfqMDJsqgvGA3DQVo0P33B2J2XedHhn1PfRdSrZ8kdo55/658VQ4E94/quXYN7fdHbysFR+jO2b6ipTlo1alsOQ+t1B/s01nZ2QHZYkS+WD22bPWMO6ucbUsQ+NAUm44muL4GkdI4EXEIsZ3PEbHgg= From 9ca7648443dfa550baa2fe2aca7c56bf46c48ff8 Mon Sep 17 00:00:00 2001 From: Han Joosten Date: Sat, 27 Oct 2018 15:26:45 +0200 Subject: [PATCH 3/5] Bump version --- ReleaseNotes.md | 4 ++++ ampersand.cabal | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 6161bf8a2f..9ec52cd045 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -2,6 +2,10 @@ ## Unreleased changes +## v3.11.4 (27 october 2018) + +* Minor changes in the releaseing of ampersand + ## v3.11.3 (28 september 2018) * Bugfix: Figures are available again in the generated specification document. diff --git a/ampersand.cabal b/ampersand.cabal index 5edcd53450..11bebe1e1a 100644 --- a/ampersand.cabal +++ b/ampersand.cabal @@ -1,5 +1,5 @@ name: ampersand -version: 3.11.3 +version: 3.11.4 author: Stef Joosten maintainer: stef.joosten@ou.nl synopsis: Toolsuite for automated design of enterprise information systems. From 728ea6dd90875c5347ea0abf207e7120d84ffc56 Mon Sep 17 00:00:00 2001 From: Han Joosten Date: Sat, 27 Oct 2018 16:23:29 +0200 Subject: [PATCH 4/5] fix tag --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9663f92207..14d6822f82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -155,7 +155,7 @@ script: before_deploy: # tag this commit - AMPERSAND_VERSION=`stack exec -- ampersand -v | sed 's/ .*//'` - - git tag '$(AMPERSAND_VERSION)' + - git tag $AMPERSAND_VERSION deploy: provider: releases From d978dd4c06b14fbd76f41f9feec84af7c1d90f74 Mon Sep 17 00:00:00 2001 From: Han Joosten Date: Sat, 27 Oct 2018 17:53:42 +0200 Subject: [PATCH 5/5] use master branch for release --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 14d6822f82..aad78939d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -163,7 +163,7 @@ deploy: file: dist/ampersand on: repo: AmpersandTarski/Ampersand - branch: cicd + branch: master tags: false condition: $BUILD = stack api-key: