Add VSCode testing to GitLab CI

Author: eliericha

.gitlab-ci.yml

@@ -22,9 +22,10 @@ stages:
 # TODO: add a build and test based on Alire in parallel to this.
 build_and_test:
   services:
-    - image:sandbox
+    - image:systemgtk
     - cpu:8
     - mem:16
+    - run_as_root:false
   stage: build_and_test
   interruptible: true
   rules:
@@ -35,25 +36,34 @@ build_and_test:
   script:
     - !reference [.basic-setup]
 
-    # Build & test using anod
+    - echo -e "\e[0Ksection_start:`date +%s`:build_als[collapsed=true]\r\e[0Kanod build als"
     - anod build als $ACI_TRACK_QUALIFIER --minimal
+    - echo -e "\e[0Ksection_end:`date +%s`:build_als\r\e[0K"
 
+    - echo -e "\e[0Ksection_start:`date +%s`:build_vscode[collapsed=true]\r\e[0Kanod build vscode-extension"
     # We pass --latest here because the vscode-extension will try to download
     # the Windows binary (it's a multi-platform extension), and this binary
     # might not be available right away.
     - anod build vscode-extension $ACI_TRACK_QUALIFIER --minimal --latest
+    - echo -e "\e[0Ksection_end:`date +%s`:build_vscode\r\e[0K"
+
+    - echo -e "\e[0Ksection_start:`date +%s`:test_als[collapsed=true]\r\e[0Kanod test als"
+    # Run ALS tests
     - anod test als $ACI_TRACK_QUALIFIER --minimal
 
     # TODO: it would be nice to have a simpler way of getting this info
-    - BUILD_SPACE=`anod eval als --primitive test build_space_name $ACI_TRACK_QUALIFIER | tr -d "'"`
-    - SB_BASE=$ANOD_DEFAULT_SANDBOX_DIR/x86_64-linux/$BUILD_SPACE
+    - ALS_BUILD_SPACE_NAME=`anod eval als --primitive test build_space_name $ACI_TRACK_QUALIFIER | tr -d "'"`
+    - ALS_BUILD_SPACE=$ANOD_DEFAULT_SANDBOX_DIR/x86_64-linux/$ALS_BUILD_SPACE_NAME
+    - echo -e "\e[0Ksection_end:`date +%s`:test_als\r\e[0K"
 
-    # Process the report
-    - e3-testsuite-report
-      --failure-exit-code 1
-      --xunit-output $CI_PROJECT_DIR/xunit_output.xml
-      $SB_BASE/results/new/ || FAILED=true
+    - echo -e "\e[0Ksection_start:`date +%s`:test_vscode[collapsed=true]\r\e[0Kanod test vscode-extension"
+    # Run VSCode tests
+    - anod test vscode-extension --qualifier=$ACI_TRACK_QUALIFIER --minimal
+    - VSCODE_BUILD_SPACE_NAME=`anod eval --primitive test --qualifier=$ACI_TRACK_QUALIFIER vscode-extension build_space_name | tr -d "'"`
+    - VSCODE_BUILD_SPACE=$ANOD_DEFAULT_SANDBOX_DIR/x86_64-linux/$VSCODE_BUILD_SPACE_NAME
+    - echo -e "\e[0Ksection_end:`date +%s`:test_vscode\r\e[0K"
 
+    - echo -e "\e[0Ksection_start:`date +%s`:lsif[collapsed=true]\r\e[0KBuild lsif report"
     # Build the lsif report
     - anod install lsif-ada
     - ( cd $ANOD_DEFAULT_SANDBOX_DIR ;
@@ -70,13 +80,32 @@ build_and_test:
       cd $ANOD_DEFAULT_SANDBOX_DIR/x86_64-linux/als/src;
       lsif-ada gnat/lsp_server.gpr > $CI_PROJECT_DIR/dump.lsif 2>/dev/null ||
       touch $CI_PROJECT_DIR/dump.lsif )
+    - echo -e "\e[0Ksection_end:`date +%s`:lsif\r\e[0K"
+
+    # Job artifacts must be produced in the project directory, so we do it at
+    # the end of the job to avoid changing Anod checkouts halfway through the
+    # job and triggering useless rebuilds.
+    - echo -e "\e[0Ksection_start:`date +%s`:prepare_artifacts[collapsed=true]\r\e[0KPrepare job artifacts"
+    # Process the als test report
+    - e3-testsuite-report
+      --failure-exit-code 1
+      --xunit-output $CI_PROJECT_DIR/als_xunit_output.xml
+      $ALS_BUILD_SPACE/results/new/ || FAILED=true
+    # Process the vscode-extension test report
+    - e3-testsuite-report
+      --failure-exit-code 1
+      --xunit-output $CI_PROJECT_DIR/vscode_xunit_output.xml
+      $VSCODE_BUILD_SPACE/results/new/ || FAILED=true
+    # Include Anod logs
+    - cp -r $ANOD_DEFAULT_SANDBOX_DIR/log $CI_PROJECT_DIR/anod-logs
+    - echo -e "\e[0Ksection_end:`date +%s`:prepare_artifacts\r\e[0K"
 
     - if [ ! -z ${FAILED+x} ]; then echo "There was at least one testcase failure" && exit 1; fi
 
   artifacts:
     when: always #  Upload on errors too
     reports:
-      junit: xunit_output.xml
+      junit: [als_xunit_output.xml, vscode_xunit_output.xml]
       lsif: dump.lsif
 
 .run_ci_common: &run_ci_common

.vscode/settings.json.tmpl

@@ -58,5 +58,7 @@
       "editor.detectIndentation": false,
       "files.trimFinalNewlines": true,
       "files.trimTrailingWhitespace": true
-   }
+   },
+   // Allow GitLab-specific Yaml tags in .gitlab-ci.yml
+   "yaml.customTags": ["!reference sequence"]
 }