From 21f15102e09d77b5f0b2b4177017edf2ed94950a Mon Sep 17 00:00:00 2001 From: "James D. Mitchell" Date: Fri, 6 Mar 2020 12:05:06 +0000 Subject: [PATCH 1/3] build: check for c99 --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 4510b075b..40c6b3ad4 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,7 @@ AC_PREFIX_DEFAULT('${abs_top_builddir}/../../bin/') dnl ## dnl ## Set the language dnl ## +AC_PROG_CC_C99 AC_PROG_CXX AC_LANG([C++]) From d4a8d17cdca8b120bf503f9894aa74b14099b89f Mon Sep 17 00:00:00 2001 From: "James D. Mitchell" Date: Mon, 16 Mar 2020 15:31:51 +0000 Subject: [PATCH 2/3] Update version numbers etc for v1.1.2 --- .VERSION | 2 +- CHANGELOG.md | 6 ++++++ PackageInfo.g | 8 ++++---- VERSIONS | 1 + 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.VERSION b/.VERSION index 524cb5524..45a1b3f44 100644 --- a/.VERSION +++ b/.VERSION @@ -1 +1 @@ -1.1.1 +1.1.2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 869b2f058..497922e5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/PackageInfo.g b/PackageInfo.g index 3d172cbd9..113f54ef2 100644 --- a/PackageInfo.g +++ b/PackageInfo.g @@ -9,12 +9,12 @@ ## ## <#GAPDoc Label="PKGVERSIONDATA"> -## +## ## ## ## ## -## +## ## ## <#/GAPDoc> @@ -26,8 +26,8 @@ _STANDREWSCS := Concatenation(["Jack Cole Building, North Haugh, ", SetPackageInfo(rec( PackageName := "Digraphs", Subtitle := "Graphs, digraphs, and multidigraphs in GAP", -Version := "1.1.1", -Date := "29/01/2020", # dd/mm/yyyy format +Version := "1.1.2", +Date := "16/03/2020", # dd/mm/yyyy format License := "GPL-3.0-or-later", ArchiveFormats := ".tar.gz", diff --git a/VERSIONS b/VERSIONS index ce2c02f60..9a046d156 100644 --- a/VERSIONS +++ b/VERSIONS @@ -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 From 8fba7f376f235c3b9f199aaeae4623bb277690cf Mon Sep 17 00:00:00 2001 From: "James D. Mitchell" Date: Mon, 16 Mar 2020 15:56:00 +0000 Subject: [PATCH 3/3] travis: only build master and stable-*.* --- .travis.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0054a5efc..3e228c705 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ +os: + linux + dist: xenial @@ -7,6 +10,11 @@ language: compiler: gcc +branches: + only: + - master + - /^stable-\d+\.\d+/ + env: global: - DIGRAPHS_LIB=digraphs-lib-0.6 @@ -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