Skip to content

Commit c40aabd

Browse files
authored
Merge branch 'main' into dc268-issue683
2 parents dfaf92d + ff2ff7c commit c40aabd

25 files changed

Lines changed: 267 additions & 350 deletions

.github/workflows/manual.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
gap-version: latest
4141
- uses: gap-actions/build-pkg-docs@v2
4242
- name: Upload compiled manuals . . .
43-
uses: actions/upload-artifact@v4
43+
uses: actions/upload-artifact@v5
4444
with:
4545
name: Digraphs manual
4646
retention-days: 7

.github/workflows/os.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,5 @@ jobs:
110110
- uses: codecov/codecov-action@v5
111111
with:
112112
token: ${{ secrets.CODECOV_TOKEN }}
113-
fail_ci_if_error: true
113+
# codecov/codecov-action seems unreliable on Windows
114+
fail_ci_if_error: ${{ runner.os != 'Windows' }}

.github/workflows/ubuntu.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ jobs:
4545
mode: default # There wouldn't be much point testing GAP v4.11 with only needed packages. The only difference is whether Grape is loaded.
4646
pkgs-to-clone: https://github.com/digraphs/graphviz.git
4747
pkgs-to-build: io* orb* datastructures* profiling* grape*
48-
- gap-version: v4.10 # Note: NautyTracesInterface requires GAP 4.12
49-
mode: default # There wouldn't be much point testing GAP v4.10 with only needed packages. The only difference is whether Grape is loaded.
50-
pkgs-to-build: io* orb* datastructures profiling* grape*
5148

5249
steps:
5350
- uses: actions/checkout@v5
@@ -60,16 +57,11 @@ jobs:
6057
- name: "Build Digraphs . . ."
6158
uses: gap-actions/build-pkg@v2
6259
- name: "Clone additional GAP packages . . ."
63-
if: ${{ matrix.gap-version != 'v4.10' }}
6460
run: |
6561
for PKG in ${{ matrix.pkgs-to-clone }}; do
6662
cd ${GAPROOT}/pkg
6763
git clone $PKG
6864
done
69-
# Special case for GAP v4.10 as it requires checking out a non-default ref
70-
- name: "Clone datastructures v0.2.5 (GAP 4.10 only) . . ."
71-
if: ${{ matrix.gap-version == 'v4.10' }}
72-
run: git clone -b v0.2.5 https://github.com/gap-packages/datastructures ${GAPROOT}/pkg/datastructures
7365
- name: "Build relevant GAP packages . . ."
7466
run: |
7567
cd ${GAPROOT}/pkg

Makefile.gappkg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ KEXT_BINARCHDIR = bin/$(GAParch)
5151
KEXT_SO = $(KEXT_BINARCHDIR)/$(KEXT_NAME).so
5252

5353
# the following settings are provided by sysinfo.gap in GAP >= 4.12;
54-
# for compatibility with older GAP version (at least 4.9, 4.10, 4.11)
54+
# for compatibility with GAP 4.11
5555
# we try to "guess" suitable values here
5656
GAP ?= $(GAPPATH)/gap
5757
GAC ?= $(GAPPATH)/gac

PackageInfo.g

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ PackageDoc := rec(
539539
),
540540

541541
Dependencies := rec(
542-
GAP := ">=4.10.0",
542+
GAP := ">=4.11.0",
543543
NeededOtherPackages := [["IO", ">=4.5.1"],
544544
["orb", ">=4.8.2"],
545545
["datastructures", ">=0.2.5"]],

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ For questions, remarks, suggestions, and issues please use the
2727
## Installation
2828

2929
It is assumed that you have a working copy of [GAP][] with version number
30-
4.10.0 or higher. The most up-to-date version of GAP, and instructions on how
30+
4.11.0 or higher. The most up-to-date version of GAP, and instructions on how
3131
to install it, can be obtained from the
3232
[main GAP webpage](https://www.gap-system.org).
3333

0 commit comments

Comments
 (0)