.gitlab-ci.yml: merge fedora-notools pipeline into fedora-minimal

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8edee7ad53da2dd5b3717d8b1dcabef4bf3f1412..948b04373bb0964ba4e0643ba670ca2483416e56 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -278,27 +278,6 @@ fedora/bootstrap:
     - .bootstrap
     - .fedora
 
-fedora-notools/build:
-  extends:
-    - .build
-    - .fedora
-  needs:
-    - fedora/bootstrap
-  script:
-    - dash ./configure --cache-file $CCACHE_FILE --disable-gcc-warnings --disable-full-test-suite --disable-doc --disable-tools --enable-tests --with-pkcs12-iter-count=10000
-    - make -j$BUILDJOBS
-    # build tests, but don't execute them
-    - make -j$BUILDJOBS check TESTS=""
-
-fedora-notools/test:
-  extends:
-    - .test
-    - .fedora
-  dependencies:
-    - fedora-notools/build
-  needs:
-    - fedora-notools/build
-
 fedora-minimal/build:
   extends:
     - .build
@@ -316,7 +295,7 @@ fedora-minimal/build:
       --disable-nls --disable-libdane --without-p11-kit --without-tpm --without-tpm2
       --disable-ssl3-support --disable-ssl2-support --disable-doc --enable-openssl-compatibility
       --disable-gcc-warnings --with-system-priority-file=""
-      --disable-gost
+      --disable-gost --disable-tools
       --with-pkcs12-iter-count=10000
     - make -j$BUILDJOBS
     # build tests, but don't execute them