Skip to content

Commit 547bdb8

Browse files
committed
Merge branch 'topic/gnatcheck/freeze_gnatformat_version' into 'master'
Freeze the gnatformat version used in the CI Closes #562 See merge request eng/libadalang/langkit-query-language!552
2 parents 453a162 + 9fd4548 commit 547bdb8

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

.gitlab-ci.yml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ include:
66
inputs:
77
stage: checkstyle
88

9+
variables:
10+
GNATFORMAT_DATE: 20250928
11+
JAVA_VERSION: 24
12+
JAVA_VENDOR: graalvm
13+
MAVEN_VERSION: 3.9.9
14+
NODEJS_VERSION: 16.19.1
15+
NPM_CACHE_ARCHIVE: prettier_java-npm_cache-20250203.tar.gz
16+
917
stages:
1018
- checkstyle
1119
- test
@@ -32,17 +40,17 @@ pre-commit:
3240
- echo $maven_local_repo
3341

3442
# Install all pre-commit dependencies
35-
- anod install gnatformat
36-
- anod build java -Q version=17,vendor=graalvm
37-
- anod build maven -Q version=3.6.3
38-
- anod build nodejs -Q version=16.19.1
43+
- anod install gnatformat -Q date=$GNATFORMAT_DATE
44+
- anod build java -Q version=$JAVA_VERSION,vendor=$JAVA_VENDOR
45+
- anod build maven -Q version=$MAVEN_VERSION
46+
- anod build nodejs -Q version=$NODEJS_VERSION
3947
- anod build maven-repo-pull -Q client=lkql
40-
- eval $(anod printenv gnatformat)
41-
- eval $(anod printenv java -Q version=17,vendor=graalvm)
42-
- eval $(anod printenv maven -Q version=3.6.3)
43-
- eval $(anod printenv nodejs -Q version=16.19.1)
48+
- eval $(anod printenv gnatformat -Q date=$GNATFORMAT_DATE)
49+
- eval $(anod printenv java -Q version=$JAVA_VERSION,vendor=$JAVA_VENDOR)
50+
- eval $(anod printenv maven -Q version=$MAVEN_VERSION)
51+
- eval $(anod printenv nodejs -Q version=$NODEJS_VERSION)
4452
- mkdir -p $npm_cache_install
45-
- e3-cathod thirdparty prettier_java-npm_cache-20250203.tar.gz --install $npm_cache_install --delete
53+
- e3-cathod thirdparty $NPM_CACHE_ARCHIVE --install $npm_cache_install --delete
4654
- ls $npm_cache_install
4755
- echo "offline=true" > $npmrc_file
4856
- export MAVEN_ARGS="-Dmaven.repo.local=$maven_local_repo -Dconfig.npmInstallCache=$npm_cache -Dconfig.npmrc=$npmrc_file"

0 commit comments

Comments
 (0)