Skip to content

Commit

Permalink
Merge branch 'stable-1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
james-d-mitchell committed Mar 17, 2020
2 parents daf6d6f + 8fba7f3 commit c3fae09
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.1
1.1.2
10 changes: 9 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
os:
linux

dist:
xenial

Expand All @@ -7,6 +10,11 @@ language:
compiler:
gcc

branches:
only:
- master
- /^stable-\d+\.\d+/

env:
global:
- DIGRAPHS_LIB=digraphs-lib-0.6
Expand All @@ -17,7 +25,7 @@ env:
# pkgs: latest | 64- & 32-bit | 32-bit | - | - | - |
# pkgs: required | coverage-64 | 64-conda | 64-bit | 32-bit | 64--bit |

matrix:
jobs:
include:
- env:
- SUITE=test
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ Torpey, Wilf A. Wilson et al.

Licensing information can be found in the `LICENSE` file.

## Version 1.1.2 (released 16/03/2020)

This is a minor release adding the new configuration flag
`--without-intrinsics` and checking that the compiler is in C99 mode by using
`AC_PROG_CC_C99` in `configure.ac`.

## Version 1.1.1 (released 29/01/2020)

This release fixes a bug in `HomomorphismDigraphsFinder` that was introduced
Expand Down
6 changes: 3 additions & 3 deletions PackageInfo.g
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
##

## <#GAPDoc Label="PKGVERSIONDATA">
## <!ENTITY VERSION "1.1.1">
## <!ENTITY VERSION "1.1.2">
## <!ENTITY GAPVERS "4.9.0">
## <!ENTITY GRAPEVERS "4.8.1">
## <!ENTITY IOVERS "4.5.1">
## <!ENTITY ORBVERS "4.8.2">
## <!ENTITY ARCHIVENAME "digraphs-1.1.1">
## <!ENTITY ARCHIVENAME "digraphs-1.1.2">
## <!ENTITY COPYRIGHTYEARS "2014-20">
## <#/GAPDoc>

Expand All @@ -27,7 +27,7 @@ SetPackageInfo(rec(
PackageName := "Digraphs",
Subtitle := "Graphs, digraphs, and multidigraphs in GAP",
Version := "1.2.0dev",
Date := "29/01/2020", # dd/mm/yyyy format
Date := "16/03/2020", # dd/mm/yyyy format
License := "GPL-3.0-or-later",
ArchiveFormats := ".tar.gz",

Expand Down
1 change: 1 addition & 0 deletions VERSIONS
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#############################################################################
##

release 1.1.2 - 16/03/2020
release 1.1.1 - 29/01/2020
release 1.1.0 - 25/01/2020
release 1.0.3 - 29/11/2019
Expand Down

0 comments on commit c3fae09

Please sign in to comment.