Skip to content

Commit 8571e86

Browse files
committed
Merge branch 'topic/lkt-build' into 'edge'
Adapt to langkit build CLI change See merge request eng/ide/ada_language_server!1976
2 parents a3c20bc + 24161d3 commit 8571e86

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.gitlab-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ include:
6969
cpus: 4
7070
disk: 80
7171
windows: true
72-
rules:
73-
# integration-testsuite cannot work with edge builds
74-
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_TARGET_BRANCH_NAME == 'edge'
75-
when: never
72+
rules:
73+
# integration-testsuite cannot work with edge builds
74+
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_TARGET_BRANCH_NAME == 'edge'
75+
when: never
7676

7777
# Optional testing of GNAT Studio
7878
- component: $CI_SERVER_FQDN/eng/gitlab-templates/test@~latest

scripts/build_als.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ function build_langkit_raw() {
172172

173173
# Export the environment needed to use langkit into a file for later
174174
# usage
175-
python manage.py setenv >"$LANGKIT_SETENV"
175+
python manage.py printenv >"$LANGKIT_SETENV"
176176

177177
if [[ $NODE_ARCH_PLATFORM == "x64/win32" ]]; then
178178
# Fix setenv.sh to be bash script for MSYS2 by replacing

0 commit comments

Comments
 (0)