diff --git a/.github/workflows/gap.yml b/.github/workflows/gap.yml index 4e1bc5913..9ec6f1a19 100644 --- a/.github/workflows/gap.yml +++ b/.github/workflows/gap.yml @@ -27,16 +27,14 @@ jobs: - stable-4.11 - stable-4.12 - stable-4.13 + ABI: [''] pkgs-to-clone: - NautyTracesInterface - ABI: [''] include: - - gap-branch: stable-4.10 - os: ubuntu - gap-branch: master - pkgs-to-clone: "NautyTracesInterface" os: macos + pkgs-to-clone: "NautyTracesInterface" - gap-branch: master os: ubuntu ABI: 32 @@ -49,7 +47,7 @@ jobs: - name: "Install GAP and clone/compile necessary packages" uses: gap-actions/setup-gap@v2 with: - GAP_PKGS_TO_CLONE: "${{ matrix.pkgs-to-clone }}" + GAP_PKGS_TO_CLONE: "${{ matrix.pkgs-to-clone }} digraphs/graphviz" GAP_PKGS_TO_BUILD: "io orb profiling grape NautyTracesInterface datastructures" GAPBRANCH: ${{ matrix.gap-branch }} ABI: ${{ matrix.ABI }} @@ -61,16 +59,6 @@ jobs: run: | curl --retry 5 -L -O "https://digraphs.github.io/Digraphs/${{ env.DIGRAPHS_LIB }}.tar.gz" tar xf "${{ env.DIGRAPHS_LIB }}.tar.gz" - - name: "Clone datastructures v0.3.0" - if: ${{ matrix.gap-branch == 'stable-4.10' }} - run: | - rm -rf $HOME/gap/pkg/datastructures - cd $HOME/gap/pkg/ - git clone https://github.com/gap-packages/datastructures.git datastructures - cd datastructures - git checkout v0.3.0 - ./configure - make - name: "Run DigraphsTestInstall" uses: gap-actions/run-pkg-tests@v2 with: @@ -101,6 +89,7 @@ jobs: - uses: gap-actions/setup-gap@cygwin-v2 with: GAP_PKGS_TO_BUILD: "io orb profiling grape datastructures" + GAP_PKGS_TO_CLONE: "digraphs/graphviz" - uses: gap-actions/build-pkg@cygwin-v1 - name: "Install digraphs-lib" run: | @@ -135,6 +124,7 @@ jobs: uses: gap-actions/setup-gap@v2 with: GAP_PKGS_TO_BUILD: "io orb profiling grape datastructures" + GAP_PKGS_TO_CLONE: "digraphs/graphviz" - name: "Build Digraphs" uses: gap-actions/build-pkg@v1 with: diff --git a/PackageInfo.g b/PackageInfo.g index dbbf820ec..cb4de63c8 100644 --- a/PackageInfo.g +++ b/PackageInfo.g @@ -10,7 +10,7 @@ ## <#GAPDoc Label="PKGVERSIONDATA"> ## -## +## ## ## ## @@ -388,7 +388,7 @@ PackageDoc := rec( ), Dependencies := rec( - GAP := ">=4.10.0", + GAP := ">=4.11.0", NeededOtherPackages := [["io", ">=4.5.1"], ["orb", ">=4.8.2"], ["graphviz", ">=0.0.0"],