Merge branch 'cicd' into development

.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"
 
 
 
@@ -146,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: master
+    tags: false
     condition: $BUILD = stack
   api-key:
     secure: ctc+qaMBb9wnQt9827grVDfqMDJsqgvGA3DQVo0P33B2J2XedHhn1PfRdSrZ8kdo55/658VQ4E94/quXYN7fdHbysFR+jO2b6ipTlo1alsOQ+t1B/s01nZ2QHZYkS+WD22bPWMO6ucbUsQ+NAUm44muL4GkdI4EXEIsZ3PEbHgg=

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.

ampersand.cabal

@@ -1,5 +1,5 @@
 name:           ampersand
-version:        3.11.3
+version:        3.11.4
 author:         Stef Joosten
 maintainer:     [email protected]
 synopsis:       Toolsuite for automated design of enterprise information systems.