Merge remote branch 'origin/master' into edge

Author: automatic-merge

.gitlab-ci.yml

@@ -9,10 +9,6 @@ stages:
 # Build and test with ANOD
 # TODO: add a build and test based on Alire in parallel to this.
 build_and_test:
-  rules:
-    # Let's do the job only for merge request events: that's
-    # when we know whether the target branch is 'edge'.
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
   services:
      - image:sandbox
      - cpu:8
@@ -26,7 +22,7 @@ build_and_test:
     # Check whether we're in an MR targeting 'edge' and setup some
     # variables if so.
     - TARGET_BRANCH="master"
-    - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "edge" ]; then
+    - if [ "x$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "xedge" ]; then
           echo "Targeting the edge branch." ;
           REPO_SUFFIX="-edge" ;
           BUILD_SPACE_SUFFIX="_edge" ;
@@ -75,11 +71,24 @@ build_and_test:
        --xunit-output $CI_PROJECT_DIR/xunit_output.xml
        x86_64-linux/als${BUILD_SPACE_SUFFIX}-test/results/new/ || FAILED=true
 
+    - anod install lsif-ada
+    - ( eval `anod printenv lsif-ada`;
+        eval `anod printenv stable-gnat`;
+        eval `anod printenv ada_libfswatch`;
+        eval `anod printenv stable-templates_parser`;
+        eval `anod printenv stable-langkit_support`;
+        eval `anod printenv stable-libgpr2 --qualifier=bare`;
+        eval `anod printenv stable-libadalang`;
+        eval `anod printenv stable-libadalang-tools`;
+        export GPR_PROJECT_PATH=/it/wave/x86_64-linux/als/src/subprojects/gnatdoc/gnat:$GPR_PROJECT_PATH;
+        export GPR_PROJECT_PATH=/it/wave/x86_64-linux/als/src/subprojects/VSS/gnat:$GPR_PROJECT_PATH;
+        cd /it/wave/x86_64-linux/als/src;
+        lsif-ada gnat/lsp_server.gpr > $CI_PROJECT_DIR/dump.lsif )
+
     - if [ ! -z ${FAILED+x} ]; then echo "There was at least one testcase failure" && exit 1; fi
 
   artifacts:
      when: always  #  Upload on errors too
-     paths:
-        - xunit_output.xml
      reports:
-       junit: xunit_output.xml
+       junit: xunit_output.xml
+       lsif: dump.lsif