Skip to content

Commit b18b15f

Browse files
committed
Merge branch 'topic/revert-ci-fragmets' into 'master'
Revert "Try the new generic_anod_ci changes" See merge request eng/ide/ada_language_server!1835
2 parents 97359fd + 69492b1 commit b18b15f

File tree

2 files changed

+1
-20
lines changed

2 files changed

+1
-20
lines changed

.gitlab-ci.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ include:
8181
allow_failure: true
8282

8383
als-cov:
84-
before_script:
85-
- eval $(refresh-ci-fragments topic/smarter-target-branch)
8684
variables:
8785
RUNNER_AFTER_SCRIPT_TIMEOUT: 10m
8886
after_script:
@@ -130,8 +128,6 @@ als-cov:
130128
- coverage/cobertura.xml
131129

132130
vscode-extension:
133-
before_script:
134-
- eval $(refresh-ci-fragments topic/smarter-target-branch)
135131
after_script:
136132
# Source the env prepared by generic_anod_ci
137133
- cat /tmp/ci_env.sh
@@ -182,19 +178,3 @@ vscode-extension:
182178
paths:
183179
- anod-logs/
184180
- coverage/cobertura-coverage.xml
185-
186-
build:
187-
before_script:
188-
- eval $(refresh-ci-fragments topic/smarter-target-branch)
189-
190-
als:
191-
before_script:
192-
- eval $(refresh-ci-fragments topic/smarter-target-branch)
193-
194-
integration-testsuite:
195-
before_script:
196-
- eval $(refresh-ci-fragments topic/smarter-target-branch)
197-
198-
gs:
199-
before_script:
200-
- eval $(refresh-ci-fragments topic/smarter-target-branch)

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ section below it for the last release. -->
55
## \<next>
66

77
* Add a setting `ada.showNotificationsOnErrors` to control whether VS Code should display error notifications for failing LSP requests.
8+
* Add support for a default `.als.json` workspace configuration file and a global `$XDG_CONFIG_HOME/als/config.json` user configuration file. See [settings.md](https://github.com/AdaCore/ada_language_server/blob/master/doc/settings.md) for more information.
89

910
## 26.0.202411173
1011

0 commit comments

Comments
 (0)