diff options
| author | Daiki Ueno <ueno@gnu.org> | 2023-02-20 09:49:32 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2023-02-21 13:30:22 +0900 |
| commit | 39a62bdd16e9eb18f318e39bb9c3ac229c3c653f (patch) | |
| tree | 57c637aca710cebf88875868d4a787df093f14a3 | |
| parent | a067a086b45a694f1a5d90229265534ccc43fe56 (diff) | |
| download | gnutls-39a62bdd16e9eb18f318e39bb9c3ac229c3c653f.tar.gz | |
.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>
| -rw-r--r-- | .gitlab-ci.yml | 17 | ||||
| -rw-r--r-- | .gitmodules | 12 |
2 files changed, 7 insertions, 22 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c1e2f371c5..525c333636 100644 --- 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 ff0b12fa73..e386e6c618 100644 --- 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 |