Skip to content

Commit c88e870

Browse files
committed
Merge branch 'topic/rm-lsif-report' into 'master'
Remove lsif report and add Anod logs to job artifacts See merge request eng/ide/ada_language_server!1261
2 parents a2870a7 + abcd326 commit c88e870

File tree

1 file changed

+2
-20
lines changed

1 file changed

+2
-20
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -63,25 +63,6 @@ build_and_test:
6363
- VSCODE_BUILD_SPACE=$ANOD_DEFAULT_SANDBOX_DIR/x86_64-linux/$VSCODE_BUILD_SPACE_NAME
6464
- echo -e "\e[0Ksection_end:`date +%s`:test_vscode\r\e[0K"
6565

66-
- echo -e "\e[0Ksection_start:`date +%s`:lsif[collapsed=true]\r\e[0KBuild lsif report"
67-
# Build the lsif report
68-
- anod install lsif-ada
69-
- ( cd $ANOD_DEFAULT_SANDBOX_DIR ;
70-
eval `anod printenv lsif-ada`;
71-
eval `anod printenv stable-gnat`;
72-
eval `anod printenv ada_libfswatch`;
73-
eval `anod printenv stable-templates_parser`;
74-
eval `anod printenv stable-langkit_support`;
75-
eval `anod printenv stable-libgpr2 --qualifier=bare`;
76-
eval `anod printenv stable-libadalang`;
77-
eval `anod printenv stable-libadalang-tools`;
78-
export GPR_PROJECT_PATH=` pwd `/x86_64-linux/als/src/subprojects/gnatdoc/gnat:$GPR_PROJECT_PATH;
79-
export GPR_PROJECT_PATH=` pwd `/x86_64-linux/als/src/subprojects/VSS/gnat:$GPR_PROJECT_PATH;
80-
cd $ANOD_DEFAULT_SANDBOX_DIR/x86_64-linux/als/src;
81-
lsif-ada gnat/lsp_server.gpr > $CI_PROJECT_DIR/dump.lsif 2>/dev/null ||
82-
touch $CI_PROJECT_DIR/dump.lsif )
83-
- echo -e "\e[0Ksection_end:`date +%s`:lsif\r\e[0K"
84-
8566
# Job artifacts must be produced in the project directory, so we do it at
8667
# the end of the job to avoid changing Anod checkouts halfway through the
8768
# job and triggering useless rebuilds.
@@ -109,7 +90,8 @@ build_and_test:
10990
when: always # Upload on errors too
11091
reports:
11192
junit: [als_xunit_output.xml, vscode_xunit_output.xml]
112-
lsif: dump.lsif
93+
paths:
94+
- anod-logs/
11395

11496
.run_ci_common: &run_ci_common
11597
stage: run_downstream_ci

0 commit comments

Comments
 (0)