.gitlab-ci.yml: take advantage of git submodules in GitLab CI

GitLab CI has support for automatic checkout of submodules, though it
requires some modifications to .gitmodules:
https://docs.gitlab.com/ee/ci/git_submodules.html

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 985e7cf5809ec2c38b492b41a5cff99503a4b456..e5bc93bae226d38064d5c3a1624887878a60638b 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,7 @@ stages:
   - archive
 
 variables:
+  GIT_SUBMODULE_STRATEGY: recursive
   # we utilize the images generated by the build-images project, to
   # speed up CI runs. We also use ccache and store config.cache
   # to speed up compilation. We include a version number in cache
@@ -52,18 +53,6 @@ default:
 
   interruptible: true
 
-.submodule-paths: &submodule-paths
-  - ./cligen
-  - ./devel/abi-dump
-  - ./devel/libtasn1
-  - ./devel/nettle
-  - ./devel/openssl
-  - ./gnulib
-  - ./tests/suite/tls-fuzzer/python-ecdsa
-  - ./tests/suite/tls-fuzzer/tlsfuzzer
-  - ./tests/suite/tls-fuzzer/tlslite-ng
-  - ./tests/suite/tls-interoperability
-  
 .bootstrap:
   stage: bootstrap
   tags:
@@ -74,8 +63,6 @@ default:
   artifacts:
     expire_in: 1 day
     untracked: true
-    # submodules are not copied through artifacts:untracked
-    paths: *submodule-paths
 
 .build:
   stage: build
@@ -87,8 +74,6 @@ default:
   artifacts:
     expire_in: 1 day
     untracked: true
-    # submodules are not copied through artifacts:untracked
-    paths: *submodule-paths
 
 .test:
   stage: test

diff --git a/.gitmodules b/.gitmodules
index ff0b12fa733dc7d7838988cc148f149126f8b22a..e386e6c61894c2977e808d50bc5fb9f7c89116cb 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -12,19 +12,19 @@
        url = https://github.com/tomato42/tlslite-ng.git
 [submodule "gnulib"]
        path = gnulib
-       url = https://gitlab.com/libidn/gnulib-mirror.git
+       url = ../../libidn/gnulib-mirror.git
 [submodule "devel/nettle"]
        path = devel/nettle
-       url = https://gitlab.com/gnutls/nettle.git
+       url = ../../gnutls/nettle.git
 [submodule "devel/libtasn1"]
        path = devel/libtasn1
-       url = https://gitlab.com/gnutls/libtasn1.git
+       url = ../../gnutls/libtasn1.git
 [submodule "devel/abi-dump"]
        path = devel/abi-dump
-       url = https://gitlab.com/gnutls/abi-dump.git
+       url = ../../gnutls/abi-dump.git
 [submodule "devel/cligen"]
        path = cligen
-       url = https://gitlab.com/gnutls/cligen.git
+       url = ../../gnutls/cligen.git
 [submodule "tests/suite/tls-interoperability"]
        path = tests/suite/tls-interoperability
-       url = https://gitlab.com/redhat-crypto/tests/interop.git
+       url = ../../redhat-crypto/tests/interop.git