Skip to content

Commit 774b7e7

Browse files
committed
Merge branch 'topic/vadim/lsp317' into 'master'
Remove support of Superprojects See merge request eng/ide/ada_language_server!1619
2 parents 1ee79c4 + 8add02d commit 774b7e7

File tree

4 files changed

+3
-2
lines changed

4 files changed

+3
-2
lines changed

.gitlab-ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ test-vscode-extension:
167167

168168
.run_ci_common: &run_ci_common
169169
stage: run_downstream_ci
170+
needs: ["test-als"]
170171
rules:
171172
- if: $CI_PIPELINE_SOURCE == 'push'
172173
when: never

gnat/lsp_client_glib.gpr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
------------------------------------------------------------------------------
22
-- Language Server Protocol --
33
-- --
4-
-- Copyright (C) 2018-2021, AdaCore --
4+
-- Copyright (C) 2018-2024, AdaCore --
55
-- --
66
-- This is free software; you can redistribute it and/or modify it under --
77
-- terms of the GNU General Public License as published by the Free Soft- --
@@ -21,7 +21,7 @@ with "spawn_glib";
2121
project LSP_Client_Glib is
2222

2323
for Source_Dirs use ("../source/client");
24-
for Object_Dir use "../.obj/" & LSP.Superproject & "/client_glib";
24+
for Object_Dir use "../.obj/client_glib";
2525

2626
package Compiler renames LSP.Compiler;
2727

0 commit comments

Comments
 (0)