Skip to content

Commit 92f754b

Browse files
kfriedbergerkfriedberger
authored
Merge pull request #526 from sosy-lab/chore/dependency-update
Chore: dependency update for project files and libraries
2 parents 525472a + 92592f2 commit 92f754b

29 files changed

+126
-129
lines changed

‎.gitlab-ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ variables:
1212
PROJECT_PATH: "sosy-lab/software/java-smt"
1313
GH_REF: "github.com/sosy-lab/java-smt"
1414
# Version of https://gitlab.com/sosy-lab/software/refaster/ to use
15-
REFASTER_REPO_REVISION: 31cd8ffc4966957e156665dbba76679ade5bb5c9
15+
REFASTER_REPO_REVISION: 26c8309d1023e4dfcb0e8d24dcf7ec12e621314e
1616
# Needs to be synchronized with Error Prone version in lib/ivy.xml
17-
REFASTER_VERSION: 2.21.1
17+
REFASTER_VERSION: 2.41.0

‎.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
# an API wrapper for a collection of SMT solvers:
33
# https://github.com/sosy-lab/java-smt
44
#
5-
# SPDX-FileCopyrightText: 2020 Dirk Beyer <https://www.sosy-lab.org>
5+
# SPDX-FileCopyrightText: 2025 Dirk Beyer <https://www.sosy-lab.org>
66
#
77
# SPDX-License-Identifier: Apache-2.0
88

99
eclipse.preferences.version=1
10+
org.eclipse.jdt.core.builder.annotationPath.allLocations=disabled
1011
org.eclipse.jdt.core.codeComplete.argumentPrefixes=p
1112
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
1213
org.eclipse.jdt.core.codeComplete.fieldPrefixes=
@@ -23,9 +24,12 @@ org.eclipse.jdt.core.compiler.annotation.nonnull=javax.annotation.Nonnull
2324
org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
2425
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.sosy_lab.common.annotations.FieldsAreNonnullByDefault
2526
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
27+
org.eclipse.jdt.core.compiler.annotation.notowning=org.eclipse.jdt.annotation.NotOwning
2628
org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable
2729
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
2830
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
31+
org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Owning
32+
org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled
2933
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3034
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
3135
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
@@ -36,6 +40,7 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
3640
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
3741
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
3842
org.eclipse.jdt.core.compiler.problem.APILeak=warning
43+
org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
3944
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore
4045
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
4146
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -57,8 +62,10 @@ org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
5762
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
5863
org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
5964
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
65+
org.eclipse.jdt.core.compiler.problem.incompatibleOwningContract=warning
6066
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
6167
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
68+
org.eclipse.jdt.core.compiler.problem.insufficientResourceAnalysis=warning
6269
org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
6370
org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
6471
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
@@ -88,14 +95,14 @@ org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
8895
org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
8996
org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
9097
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
91-
org.eclipse.jdt.core.compiler.problem.nullReference=warning
98+
org.eclipse.jdt.core.compiler.problem.nullReference=error
9299
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
93100
org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
94101
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
95102
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
96103
org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
97104
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
98-
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
105+
org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
99106
org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
100107
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
101108
org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
@@ -108,14 +115,15 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
108115
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
109116
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled
110117
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
118+
org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=ignore
111119
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
112120
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
113121
org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
114122
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
115123
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
116124
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
117125
org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
118-
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
126+
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=info
119127
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
120128
org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
121129
org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
@@ -128,9 +136,10 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
128136
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
129137
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
130138
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
131-
org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
139+
org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=info
132140
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
133141
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
142+
org.eclipse.jdt.core.compiler.problem.unusedLambdaParameter=warning
134143
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
135144
org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
136145
org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
@@ -139,7 +148,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
139148
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
140149
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
141150
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
142-
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
151+
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=info
143152
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
144153
org.eclipse.jdt.core.compiler.processAnnotations=enabled
145154
org.eclipse.jdt.core.compiler.release=enabled

‎build/build-compile.xml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ SPDX-License-Identifier: Apache-2.0
3636
<exclude name="**/*.java" />
3737
</patternset>
3838

39-
<!-- error-prone config from https://errorprone.info/docs/installation#jdk-16 -->
39+
<!-- error-prone config from https://errorprone.info/docs/installation#ant -->
4040
<property name="errorprone.options.required" value="
4141
-XDcompilePolicy=simple
42+
--should-stop=ifError=FLOW
4243
-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
4344
-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
4445
-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
@@ -55,6 +56,11 @@ SPDX-License-Identifier: Apache-2.0
5556
<javaversion atleast="21"/>
5657
</condition>
5758

59+
<!-- Current versions of Error Prone do not support running on Java 11 anymore. -->
60+
<condition property="errorprone.disable">
61+
<javaversion exactly="11"/>
62+
</condition>
63+
5864
<!-- We use error-prone as the compiler, cf. http://errorprone.info/ -->
5965
<target name="build-project" unless="skipBuild" depends="build-dependencies">
6066
<depend srcdir="${source.dir}" destdir="${class.dir}"/>
@@ -74,7 +80,7 @@ SPDX-License-Identifier: Apache-2.0
7480
<src path="${source.dir}"/>
7581
<classpath refid="classpath"/>
7682
<compilerarg value="-Xlint"/>
77-
<compilerarg value="-Xlint:-fallthrough"/> <!-- checked by error-prone, too, and javac does not recognize $FALL-THROUGH$ -->
83+
<compilerarg value="-Xlint:-fallthrough"/> <!-- checked by error-prone, too, and javac does not recognized $FALL-THROUGH$ -->
7884
<compilerarg value="-Xlint:-processing"/>
7985
<compilerarg value="-Xlint:-options"/> <!-- suppress warning about bootclasspath on newer JDK -->
8086
<compilerarg value="-Xlint:-this-escape" if:set="java21"/> <!-- false alarm for every use of configuration injection -->
@@ -130,11 +136,14 @@ SPDX-License-Identifier: Apache-2.0
130136
<mkdir dir="${source.generated.dir}"/>
131137

132138
<copy file=".settings/org.eclipse.jdt.core.prefs" tofile="${ivy.lib.dir}/build/org.eclipse.jdt.core.prefs">
133-
<!-- Convert all compiler warnings to errors. -->
139+
<!-- Convert all compiler warnings to errors and ignore info messages to not clutter the output. -->
134140
<filterchain>
135141
<replacetokens begintoken="=" endtoken="g">
136142
<token key="warnin" value="=error"/>
137143
</replacetokens>
144+
<replacetokens begintoken="=" endtoken="o">
145+
<token key="inf" value="=ignore"/>
146+
</replacetokens>
138147
</filterchain>
139148
</copy>
140149

‎build/build-documentation.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ SPDX-License-Identifier: Apache-2.0
3737

3838
<classpath refid="classpath"/>
3939

40-
<!-- "-v" is an optional param for verbose output of OptionCollector -->
40+
<!-- "-v" is a optional param for verbose output of OptionCollector -->
4141
<!-- <arg value="-v"/> -->
4242
</java>
4343
<echo message="Options collected." level="info"/>

‎build/build-ivy.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ SPDX-License-Identifier: Apache-2.0
4646
</condition>
4747
<property name="ivy.cache.dir" location="${tmp.ivy.cache.dir}" />
4848

49-
<!-- If necessary, download Ivy from website so that it does not need to be installed. -->
49+
<!-- If necessary, download Ivy from web site so that it does not need to be installed. -->
5050
<target name="bootstrap-ivy" unless="ivy.jar.present">
5151
<mkdir dir="${ivy.jar.dir}"/>
5252
<echo message="Downloading ivy..."/>

‎build/gitlab-ci.Dockerfile.jdk-11‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
#
77
# SPDX-License-Identifier: Apache-2.0
88

9-
# This is a Docker image for running the tests.
9+
# This is a container image for running the tests.
1010
# It should be pushed to registry.gitlab.com/sosy-lab/software/java-smt/test
1111
# and will be used by CI as declared in .gitlab-ci.yml.
1212
#
1313
# Commands for updating the image:
14-
# docker build --pull -t registry.gitlab.com/sosy-lab/software/java-smt/test:jdk-11 - < build/gitlab-ci.Dockerfile.jdk-11
15-
# docker push registry.gitlab.com/sosy-lab/software/java-smt/test:jdk-11
14+
# podman build --pull -t registry.gitlab.com/sosy-lab/software/java-smt/test:jdk-11 - < build/gitlab-ci.Dockerfile.jdk-11
15+
# podman push registry.gitlab.com/sosy-lab/software/java-smt/test:jdk-11
1616

1717
FROM ubuntu:20.04
1818

‎build/gitlab-ci.Dockerfile.jdk-17‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
#
77
# SPDX-License-Identifier: Apache-2.0
88

9-
# This is a Docker image for running the tests.
9+
# This is a container image for running the tests.
1010
# It should be pushed to registry.gitlab.com/sosy-lab/software/java-smt/test
1111
# and will be used by CI as declared in .gitlab-ci.yml.
1212
#
1313
# Commands for updating the image:
14-
# docker build --pull -t registry.gitlab.com/sosy-lab/software/java-smt/test:jdk-17 - < build/gitlab-ci.Dockerfile.jdk-17
15-
# docker push registry.gitlab.com/sosy-lab/software/java-smt/test:jdk-17
14+
# podman build --pull -t registry.gitlab.com/sosy-lab/software/java-smt/test:jdk-17 - < build/gitlab-ci.Dockerfile.jdk-17
15+
# podman push registry.gitlab.com/sosy-lab/software/java-smt/test:jdk-17
1616

1717
FROM ubuntu:20.04
1818

‎build/gitlab-ci.Dockerfile.jdk-21‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
#
77
# SPDX-License-Identifier: Apache-2.0
88

9-
# This is a Docker image for running the tests.
9+
# This is a container image for running the tests.
1010
# It should be pushed to registry.gitlab.com/sosy-lab/software/java-smt/test
1111
# and will be used by CI as declared in .gitlab-ci.yml.
1212
#
1313
# Commands for updating the image:
14-
# docker build --pull -t registry.gitlab.com/sosy-lab/software/java-smt/test:jdk-21 - < build/gitlab-ci.Dockerfile.jdk-21
15-
# docker push registry.gitlab.com/sosy-lab/software/java-smt/test:jdk-21
14+
# podman build --pull -t registry.gitlab.com/sosy-lab/software/java-smt/test:jdk-21 - < build/gitlab-ci.Dockerfile.jdk-21
15+
# podman push registry.gitlab.com/sosy-lab/software/java-smt/test:jdk-21
1616

1717
FROM ubuntu:20.04
1818

‎build/gitlab-ci.Dockerfile.jdk-23‎ renamed to ‎build/gitlab-ci.Dockerfile.jdk-24‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
#
77
# SPDX-License-Identifier: Apache-2.0
88

9-
# This is a Docker image for running the tests.
9+
# This is a container image for running the tests.
1010
# It should be pushed to registry.gitlab.com/sosy-lab/software/java-smt/test
1111
# and will be used by CI as declared in .gitlab-ci.yml.
1212
#
1313
# Commands for updating the image:
14-
# docker build --pull -t registry.gitlab.com/sosy-lab/software/java-smt/test:jdk-23 - < build/gitlab-ci.Dockerfile.jdk-23
15-
# docker push registry.gitlab.com/sosy-lab/software/java-smt/test:jdk-23
14+
# podman build --pull -t registry.gitlab.com/sosy-lab/software/java-smt/test:jdk-24 - < build/gitlab-ci.Dockerfile.jdk-24
15+
# podman push registry.gitlab.com/sosy-lab/software/java-smt/test:jdk-24
1616

17-
# Older Ubuntu versions currently do not have GLIC_2.34 and Java 23
18-
FROM ubuntu:24.10
17+
# LTS versions currently do not have Java 24
18+
FROM ubuntu:25.04
1919

2020
ENV DEBIAN_FRONTEND=noninteractive
2121
ENV TZ=UTC
@@ -25,9 +25,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2525
curl \
2626
git \
2727
jq \
28-
openjdk-23-jdk-headless \
28+
openjdk-24-jdk-headless \
2929
wget \
3030
&& rm -rf /var/lib/apt/lists/*
3131

32+
ENV LANG C.UTF-8
33+
3234
RUN apt-get update && apt-get install -y \
3335
libgomp1

‎build/gitlab-ci.yml‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ build-dependencies:
5757
build:jdk-11: { extends: .build, image: "${CI_REGISTRY_IMAGE}/test:jdk-11" }
5858
build:jdk-17: { extends: .build, image: "${CI_REGISTRY_IMAGE}/test:jdk-17" }
5959
build:jdk-21: { extends: .build, image: "${CI_REGISTRY_IMAGE}/test:jdk-21" }
60-
build:jdk-23: { extends: .build, image: "${CI_REGISTRY_IMAGE}/test:jdk-23" }
60+
build:jdk-24: { extends: .build, image: "${CI_REGISTRY_IMAGE}/test:jdk-24" }
6161

6262
# For checks that need the binaries
6363
.binary_check:
@@ -78,14 +78,16 @@ build:jdk-23: { extends: .build, image: "${CI_REGISTRY_IMAGE}/test:jdk-23" }
7878

7979
build-project-ecj:jdk-17: {extends: .build-project-ecj, image: "${CI_REGISTRY_IMAGE}/test:jdk-17" }
8080
build-project-ecj:jdk-21: {extends: .build-project-ecj, image: "${CI_REGISTRY_IMAGE}/test:jdk-21" }
81-
build-project-ecj:jdk-23: {extends: .build-project-ecj, image: "${CI_REGISTRY_IMAGE}/test:jdk-23" }
81+
build-project-ecj:jdk-24: {extends: .build-project-ecj, image: "${CI_REGISTRY_IMAGE}/test:jdk-24" }
8282

8383
check-format:
8484
extends: .source_check
85+
image: ${CI_REGISTRY_IMAGE}/test:jdk-17
8586
script: "ant $ANT_PROPS_CHECKS format-source && git diff -s --exit-code"
8687

8788
checkstyle:
8889
extends: .source_check
90+
image: ${CI_REGISTRY_IMAGE}/test:jdk-17
8991
script:
9092
- "ant $ANT_PROPS_CHECKS checkstyle"
9193
- "ant $ANT_PROPS_CHECKS run-checkstyle -Dcheckstyle.output=plain && cat Checkstyle*.xml && test $(cat Checkstyle*xml | grep -vic audit) -eq 0"
@@ -154,10 +156,10 @@ unit-tests:x86_64:jdk-21:
154156
extends: .unit-tests
155157
needs: [ build-dependencies, build:jdk-21 ]
156158
image: "${CI_REGISTRY_IMAGE}/test:jdk-21"
157-
unit-tests:x86_64:jdk-23:
159+
unit-tests:x86_64:jdk-24:
158160
extends: .unit-tests
159-
needs: [ build-dependencies, build:jdk-23 ]
160-
image: "${CI_REGISTRY_IMAGE}/test:jdk-23"
161+
needs: [ build-dependencies, build:jdk-24 ]
162+
image: "${CI_REGISTRY_IMAGE}/test:jdk-24"
161163

162164
unit-tests:arm64:jdk-11:
163165
extends: .unit-tests-quick
@@ -171,14 +173,14 @@ unit-tests:arm64:jdk-21:
171173
extends: .unit-tests-quick
172174
needs: [ build-dependencies, build:jdk-21 ]
173175
image: { name: "${CI_REGISTRY_IMAGE}/test:jdk-21-arm64", docker: { platform: linux/arm64 } }
174-
unit-tests:arm64:jdk-23:
176+
unit-tests:arm64:jdk-24:
175177
extends: .unit-tests-quick
176-
needs: [ build-dependencies, build:jdk-23 ]
177-
image: { name: "${CI_REGISTRY_IMAGE}/test:jdk-23-arm64", docker: { platform: linux/arm64 } }
178+
needs: [ build-dependencies, build:jdk-24 ]
179+
image: { name: "${CI_REGISTRY_IMAGE}/test:jdk-24-arm64", docker: { platform: linux/arm64 } }
178180

179181
refaster:
180182
extends: .source_check
181-
image: ${CI_REGISTRY_IMAGE}/test:jdk-11
183+
image: ${CI_REGISTRY_IMAGE}/test:jdk-17
182184
before_script:
183185
- 'test -d refaster || git clone https://gitlab.com/sosy-lab/software/refaster.git'
184186
- 'cd refaster'
@@ -199,10 +201,8 @@ refaster:
199201
- "error-prone.patch"
200202
- "rule.refaster"
201203
when: on_failure
202-
except:
203-
variables:
204-
- $REFASTER_REPO_REVISION == null # required for job
205-
- $REFASTER_VERSION == null # required for job
204+
rules:
205+
- if: $REFASTER_REPO_REVISION != null && $REFASTER_VERSION != null # required for job
206206

207207

208208
# check license declarations etc.
@@ -223,13 +223,15 @@ deploy-gh-pages:
223223
- build:jdk-11
224224
- javadoc
225225
environment: deploy/gh-pages
226-
only:
227-
variables:
228-
- $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # only on default branch
229-
- $CI_PROJECT_PATH == $PROJECT_PATH # not on forks
230-
except:
231-
variables:
232-
- $GH_TOKEN == null # required for job
226+
rules:
227+
# run only if:
228+
# - on default branch
229+
# - not on a fork,
230+
# - GH_TOKEN is present (required for job)
231+
- if: >
232+
$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
233+
&& $CI_PROJECT_PATH == $PROJECT_PATH
234+
&& $GH_TOKEN != null
233235
234236
235237
# Build container images
@@ -247,9 +249,9 @@ deploy-gh-pages:
247249
- mkdir -p /root/.docker
248250
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
249251
- /kaniko/executor --dockerfile $CI_PROJECT_DIR/$DOCKERFILE --destination $CI_REGISTRY_IMAGE/$IMAGE $EXTRA_ARGS
250-
only:
251-
- schedules
252-
- web
252+
rules:
253+
- if: $CI_PIPELINE_SOURCE == "schedule"
254+
- if: $CI_PIPELINE_SOURCE == "web"
253255

254256
.build-docker:arm64:
255257
extends: .build-docker
@@ -262,9 +264,9 @@ deploy-gh-pages:
262264
build-docker:x86_64:jdk-11: { extends: .build-docker, variables: { JDK_VERSION: jdk-11 } }
263265
build-docker:x86_64:jdk-17: { extends: .build-docker, variables: { JDK_VERSION: jdk-17 } }
264266
build-docker:x86_64:jdk-21: { extends: .build-docker, variables: { JDK_VERSION: jdk-21 } }
265-
build-docker:x86_64:jdk-23: { extends: .build-docker, variables: { JDK_VERSION: jdk-23 } }
267+
build-docker:x86_64:jdk-24: { extends: .build-docker, variables: { JDK_VERSION: jdk-24 } }
266268

267269
build-docker:arm64:jdk-11: { extends: .build-docker:arm64, variables: { JDK_VERSION: jdk-11 } }
268270
build-docker:arm64:jdk-17: { extends: .build-docker:arm64, variables: { JDK_VERSION: jdk-17 } }
269271
build-docker:arm64:jdk-21: { extends: .build-docker:arm64, variables: { JDK_VERSION: jdk-21 } }
270-
build-docker:arm64:jdk-23: { extends: .build-docker:arm64, variables: { JDK_VERSION: jdk-23 } }
272+
build-docker:arm64:jdk-24: { extends: .build-docker:arm64, variables: { JDK_VERSION: jdk-24 } }

0 commit comments

Comments
 (0)