Update branch

.gitlab/build-codecompass.sh

@@ -49,7 +49,8 @@ export CMAKE_PREFIX_PATH=$DEPS_INSTALL_RUNTIME_DIR/libgit2-install\
 :$DEPS_INSTALL_RUNTIME_DIR/thrift-install\
 :$DEPS_INSTALL_RUNTIME_DIR/boost-install\
 :$DEPS_INSTALL_RUNTIME_DIR/llvm-install\
-:$DEPS_INSTALL_RUNTIME_DIR/python-install
+:$DEPS_INSTALL_RUNTIME_DIR/python-install\
+:$DEPS_INSTALL_RUNTIME_DIR/openldap-install
 
 export GTEST_ROOT=$DEPS_INSTALL_BUILD_DIR/gtest-install
 
@@ -62,6 +63,7 @@ cmake $CC_SRC_DIR \
   -DCMAKE_INSTALL_PREFIX=$CC_INSTALL_DIR \
   -DDATABASE=pgsql \
   -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+  -DWITH_AUTH="plain;ldap" \
   -DLLVM_DIR=$DEPS_INSTALL_RUNTIME_DIR/llvm/lib/cmake/llvm/ \
   -DClang_DIR=$DEPS_INSTALL_RUNTIME_DIR/llvm/lib/cmake/clang/
 make install --quiet --jobs $(nproc)

.gitlab/build-deps.sh

@@ -50,12 +50,12 @@ export PATH=$DEPS_INSTALL_BUILD_DIR/cmake-install/bin:$PATH
 ######
 
 cd $PACKAGES_DIR
-wget --no-verbose --no-clobber https://ftp.gnu.org/gnu/m4/m4-1.4.18.tar.gz
-tar -xf m4-1.4.18.tar.gz
-cd m4-1.4.18
+wget --no-verbose --no-clobber https://ftp.gnu.org/gnu/m4/m4-1.4.19.tar.gz
+tar -xf m4-1.4.19.tar.gz
+cd m4-1.4.19
 ./configure --quiet --prefix=$DEPS_INSTALL_BUILD_DIR/m4-install
 make install --quiet --jobs $(nproc)
-rm -rf $PACKAGES_DIR/m4-1.4.18.tar.gz
+rm -rf $PACKAGES_DIR/m4-1.4.19.tar.gz
 
 ###########
 # libtool #
@@ -137,8 +137,8 @@ if [ ! -f $DEPS_INSTALL_RUNTIME_DIR/odb-install/bin/odb ]; then
   if [[ $ODB_VERSION == "2.5.0" ]]; then
     # build2
     cd $PACKAGES_DIR
-    wget --no-verbose --no-clobber https://download.build2.org/0.13.0/build2-install-0.13.0.sh
-    sh build2-install-0.13.0.sh --yes --trust yes --jobs $(nproc) $PACKAGES_DIR/build2-install
+    wget --no-verbose --no-clobber https://download.build2.org/0.14.0/build2-install-0.14.0.sh
+    sh build2-install-0.14.0.sh --yes --trust yes --jobs $(nproc) $PACKAGES_DIR/build2-install
     export PATH=$PACKAGES_DIR/build2-install/bin:$PATH
 
     # odb, libodb
@@ -160,7 +160,7 @@ if [ ! -f $DEPS_INSTALL_RUNTIME_DIR/odb-install/bin/odb ]; then
     bpkg build libodb-pgsql --yes --quiet --jobs $(nproc)
     bpkg install --all --recursive --quiet --jobs $(nproc)
 
-    rm -f $PACKAGES_DIR/build2-toolchain-0.13.0.tar.xz
+    rm -f $PACKAGES_DIR/build2-toolchain-0.14.0.tar.xz
   elif [[ $ODB_VERSION == "2.4.0" ]]; then
     # odb
     cd $PACKAGES_DIR
@@ -310,7 +310,7 @@ rm -f $PACKAGES_DIR/ctags-p5.9.20201129.0.tar.gz
 
 if [ ! -f $DEPS_INSTALL_RUNTIME_DIR/boost-install/lib/libboost_program_options.so ]; then
   cd $PACKAGES_DIR
-  wget --no-verbose --no-clobber https://dl.bintray.com/boostorg/release/1.74.0/source/boost_1_74_0.tar.gz
+  wget --no-verbose --no-clobber https://boostorg.jfrog.io/artifactory/main/release/1.74.0/source/boost_1_74_0.tar.gz
   tar -xf boost_1_74_0.tar.gz
   cd boost_1_74_0
 
@@ -386,6 +386,22 @@ cd $DEPS_INSTALL_RUNTIME_DIR
 mv node-v14.15.0-linux-x64 node-install
 export PATH=$DEPS_INSTALL_RUNTIME_DIR/node-install/bin:$PATH
 
+############
+# OpenLDAP #
+############
+
+cd $PACKAGES_DIR
+wget --no-verbose --no-clobber http://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-2.5.6.tgz
+tar -xf openldap-2.5.6.tgz
+
+cd openldap-2.5.6
+./configure --quiet --prefix=$DEPS_INSTALL_RUNTIME_DIR/openldap-install
+make depend
+make
+make install
+
+rm -f $PACKAGES_DIR/openldap-2.5.6.tgz
+
 #######
 # pip #
 #######

.gitlab/cc-env.sh

@@ -19,6 +19,7 @@ export LD_LIBRARY_PATH=$DEPS_INSTALL_DIR/libgit2-install/lib64\
 :$DEPS_INSTALL_DIR/libtool-install/lib\
 :$DEPS_INSTALL_DIR/postgresql-install/lib\
 :$DEPS_INSTALL_DIR/python-install/lib\
+:$DEPS_INSTALL_DIR/openldap-install/lib\
 :$LD_LIBRARY_PATH
 # Note: libgit2-install/lib required on Ubuntu; libgit2-install/lib64 on SUSE
 

.gitlab/ci.yml

@@ -1,3 +1,11 @@
+workflow:
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "trigger"'
+      when: always
+    - if: '$CI_PIPELINE_SOURCE == "web"'
+      when: always
+    - when: never
+
 stages:
     - prepare
     - package
@@ -14,7 +22,6 @@ variables:
 
 .tarball:
     stage: package
-    when: manual
     allow_failure: false
     timeout: 12h
     tags: ["long-running"]
@@ -55,9 +62,9 @@ tarball suse-15:
     extends: .tarball
     image: opensuse/leap:15
     cache:
-        key: "leap"
+        key: "leap-$CI_COMMIT_REF_SLUG"
     variables:
-        GCC_VERSION: 7.5.0
+        GCC_VERSION: 9.3.0
         ODB_VERSION: 2.5.0
     before_script:
         - zypper refresh
@@ -67,6 +74,8 @@ tarball suse-15:
         # build tools for CodeCompass
         - zypper install -y -t pattern devel_basis
         - zypper install -y binutils gcc-c++ gmp-devel
+        # build tools for OpenLDAP
+        - zypper install -y groff
         # build tools for ccdb-tools
         - zypper install -y libffi-devel
         # show GLIBC verison
@@ -76,7 +85,7 @@ tarball suse-42.1:
     extends: .tarball
     image: opensuse/archive:42.1
     cache:
-        key: "malachite"
+        key: "malachite-$CI_COMMIT_REF_SLUG"
     variables:
         GCC_VERSION: 5.5.0
         ODB_VERSION: 2.4.0
@@ -88,16 +97,21 @@ tarball suse-42.1:
         # build tools for CodeCompass
         - zypper install -y -t pattern devel_basis
         - zypper install -y binutils gcc-c++ gmp-devel
+        # build tools for OpenLDAP
+        - zypper install -y groff
         # build tools for ccdb-tools
         - zypper install -y libffi-devel
+        # disable SSL certificate check (distribution's cacert is outdated)
+        - echo "check_certificate = off" >> /etc/wgetrc
+        - echo insecure >> ~/.curlrc
         # show GLIBC verison
         - *show-glibc-version
 
 tarball ubuntu-16.04:
     extends: .tarball
     image: ubuntu:16.04
     cache:
-        key: "xenial"
+        key: "xenial-$CI_COMMIT_REF_SLUG"
     variables:
         GCC_VERSION: 5.5.0
         ODB_VERSION: 2.4.0
@@ -109,6 +123,8 @@ tarball ubuntu-16.04:
         - apt-get install -yqq build-essential libgmp-dev zlib1g-dev
         # build tools for ctags
         - apt-get install -yqq dh-autoreconf pkg-config
+        # build tools for OpenLDAP
+        - apt install -yqq groff-base
         # build tools for ccdb-tools
         - apt-get install -yqq libffi-dev
         # show GLIBC verison
@@ -117,7 +133,6 @@ tarball ubuntu-16.04:
 .upload:
     stage: deploy
     image: ubuntu:20.04
-    when: manual
     allow_failure: false
     variables:
         FILENAME: codecompass-$CI_COMMIT_BRANCH.tar.gz