Skip to content

Commit 28a82ca

Browse files
ci: clone graphviz
1 parent 443ff11 commit 28a82ca

File tree

2 files changed

+7
-17
lines changed

2 files changed

+7
-17
lines changed

.github/workflows/gap.yml

+5-15
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,14 @@ jobs:
2727
- stable-4.11
2828
- stable-4.12
2929
- stable-4.13
30+
ABI: ['']
3031
pkgs-to-clone:
3132
- NautyTracesInterface
32-
ABI: ['']
3333

3434
include:
35-
- gap-branch: stable-4.10
36-
os: ubuntu
3735
- gap-branch: master
38-
pkgs-to-clone: "NautyTracesInterface"
3936
os: macos
37+
pkgs-to-clone: "NautyTracesInterface"
4038
- gap-branch: master
4139
os: ubuntu
4240
ABI: 32
@@ -49,7 +47,7 @@ jobs:
4947
- name: "Install GAP and clone/compile necessary packages"
5048
uses: gap-actions/setup-gap@v2
5149
with:
52-
GAP_PKGS_TO_CLONE: "${{ matrix.pkgs-to-clone }}"
50+
GAP_PKGS_TO_CLONE: "${{ matrix.pkgs-to-clone }} digraphs/graphviz"
5351
GAP_PKGS_TO_BUILD: "io orb profiling grape NautyTracesInterface datastructures"
5452
GAPBRANCH: ${{ matrix.gap-branch }}
5553
ABI: ${{ matrix.ABI }}
@@ -61,16 +59,6 @@ jobs:
6159
run: |
6260
curl --retry 5 -L -O "https://digraphs.github.io/Digraphs/${{ env.DIGRAPHS_LIB }}.tar.gz"
6361
tar xf "${{ env.DIGRAPHS_LIB }}.tar.gz"
64-
- name: "Clone datastructures v0.3.0"
65-
if: ${{ matrix.gap-branch == 'stable-4.10' }}
66-
run: |
67-
rm -rf $HOME/gap/pkg/datastructures
68-
cd $HOME/gap/pkg/
69-
git clone https://github.com/gap-packages/datastructures.git datastructures
70-
cd datastructures
71-
git checkout v0.3.0
72-
./configure
73-
make
7462
- name: "Run DigraphsTestInstall"
7563
uses: gap-actions/run-pkg-tests@v2
7664
with:
@@ -101,6 +89,7 @@ jobs:
10189
- uses: gap-actions/setup-gap@cygwin-v2
10290
with:
10391
GAP_PKGS_TO_BUILD: "io orb profiling grape datastructures"
92+
GAP_PKGS_TO_CLONE: "digraphs/graphviz"
10493
- uses: gap-actions/build-pkg@cygwin-v1
10594
- name: "Install digraphs-lib"
10695
run: |
@@ -135,6 +124,7 @@ jobs:
135124
uses: gap-actions/setup-gap@v2
136125
with:
137126
GAP_PKGS_TO_BUILD: "io orb profiling grape datastructures"
127+
GAP_PKGS_TO_CLONE: "digraphs/graphviz"
138128
- name: "Build Digraphs"
139129
uses: gap-actions/build-pkg@v1
140130
with:

PackageInfo.g

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
## <#GAPDoc Label="PKGVERSIONDATA">
1212
## <!ENTITY VERSION "1.7.1">
13-
## <!ENTITY GAPVERS "4.10.0">
13+
## <!ENTITY GAPVERS "4.11.0">
1414
## <!ENTITY GRAPEVERS "4.8.1">
1515
## <!ENTITY IOVERS "4.5.1">
1616
## <!ENTITY ORBVERS "4.8.2">
@@ -388,7 +388,7 @@ PackageDoc := rec(
388388
),
389389

390390
Dependencies := rec(
391-
GAP := ">=4.10.0",
391+
GAP := ">=4.11.0",
392392
NeededOtherPackages := [["io", ">=4.5.1"],
393393
["orb", ">=4.8.2"],
394394
["graphviz", ">=0.0.0"],

0 commit comments

Comments
 (0)