Revert "CI: build NormalizInterface against libnormaliz-dev"

This reverts commit ff1054d.
gap-system · Apr 21, 2022 · ee22ba8 · ee22ba8
1 parent ff1054d
commit ee22ba8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -57,6 +57,10 @@ jobs:
             # test error reporting and compiling as well as libgap
             "testexpect testmockpkg testspecial test-compile testlibgap testkernel",
 
+            # compile packages and run GAP tests
+            # don't use --enable-debug to prevent the tests from taking too long
+            "testpackages testinstall-loadall",
+
             # test creating the manual
             # TODO: make the resulting HTML and PDF files available as build
             # artifacts so that one can read the latest documentation (or even
@@ -83,16 +87,10 @@ jobs:
             test-suites: "testinstall"
             extra: "HPCGAP=yes ABI=64"
 
-          # compile packages and run GAP tests
-          # don't use --enable-debug to prevent the tests from taking too long
-          - os: ubuntu-latest
-            shell: bash
-            test-suites: "testpackages testinstall-loadall"
-
           # compile packages and run GAP tests in 32 bit mode
           # it seems profiling is having trouble collecting the coverage data
           # here, so we use NO_COVERAGE=1
-          - os: ubuntu-latest
+          - os: ubuntu-18.04
             shell: bash
             test-suites: "testpackages testinstall-loadall"
             extra: "ABI=32 NO_COVERAGE=1"
@@ -183,14 +181,14 @@ jobs:
                    if [[ $TEST_SUITES == *testpackages* ]] ; then
                        packages+=(            # For:
                          4ti2                   # 4ti2Interface
+                         libboost-dev           # NormalizInterface
                          libcdd-dev             # CddInterface
                          libcurl4-openssl-dev   # curlInterface
                          libfplll-dev           # float
                          libmpc-dev             # float
                          libmpfi-dev            # float
                          libmpfr-dev            # float
                          libncurses5-dev        # browse
-                         libnormaliz-dev        # NormalizInterface
                          libzmq3-dev            # ZeroMQInterface
                          pari-gp                # alnuth
                          singular               # singular

diff --git a/dev/ci.sh b/dev/ci.sh
@@ -50,11 +50,6 @@ do
     # HACK to work out timestamp issues with anupq
     touch anupq*/configure* anupq*/Makefile* anupq*/aclocal.m4
 
-    # HACK: prevent BuildPackages.sh from building the Normaliz verison
-    # "bundled" with NormalizInterface. Instead we want it to use
-    # libnormaliz-dev installed by us
-    rm -f */build-normaliz.sh
-
     # HACK/WORKAROUND: excise `-march=native` from some configure
     # scripts by replacing it with `-g0` ; we do it this way to simplify
     # the patching process (we don't want to use an actual patchh file