Skip to content

Commit e68f835

Browse files
GitLab CI: remove confusing tag comments, put required tools first
1 parent c0f6787 commit e68f835

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

.gitlab-ci.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
# https://docs.gitlab.com/ci/yaml/
2+
13
# Default image for linux builds
24
# Using core instead of base to get access to ASAN from clang.
3-
image: objectboxio/buildenv-core:2023-07-28 # Includes JDK 17.0.8
5+
image: objectboxio/buildenv-core:2023-07-28
46

57
# Assumes these environment variables are configured in GitLab CI/CD Settings:
68
# - OBX_READ_PACKAGES_TOKEN
@@ -47,7 +49,7 @@ test:
4749
stage: test
4850
tags:
4951
- docker
50-
- linux # Select Docker host that can run the used Linux image
52+
- linux
5153
- x64
5254
variables:
5355
# Image defaults to POSIX (ASCII), set a compatible locale so UTF-8 tests that interact with the file system work.
@@ -97,17 +99,17 @@ test-macos:
9799
extends: .test-template
98100
needs: ["test"]
99101
tags:
102+
- jdk
100103
- mac
101104
- x64
102-
- jdk
103105
script: ./gradlew $GITLAB_REPO_ARGS $VERSION_ARGS clean build
104106

105107
# Address sanitizer is only available on Linux runners (see script).
106108
.test-asan-template:
107109
extends: .test-template
108110
tags:
109111
- docker
110-
- linux # Select Docker host that can run the used Linux image
112+
- linux
111113
- x64
112114
variables:
113115
# Image defaults to POSIX (ASCII), set a compatible locale so UTF-8 tests that interact with the file system work.
@@ -150,7 +152,7 @@ publish-maven-internal:
150152
stage: publish-maven-internal
151153
tags:
152154
- docker
153-
- linux # Select Docker host that can run the used Linux image
155+
- linux
154156
- x64
155157
rules:
156158
# Not for main branch, doing so may duplicate release artifacts (uploaded from publish branch)
@@ -172,7 +174,7 @@ publish-maven-central:
172174
stage: publish-maven-central
173175
tags:
174176
- docker
175-
- linux # Select Docker host that can run the used Linux image
177+
- linux
176178
- x64
177179
rules:
178180
# Only on publish branch, only if no previous stages failed
@@ -193,7 +195,7 @@ package-api-docs:
193195
stage: package-api-docs
194196
tags:
195197
- docker
196-
- linux # Select Docker host that can run the used Linux image
198+
- linux
197199
- x64
198200
rules:
199201
# Only on publish branch, only if no previous stages failed

0 commit comments

Comments
 (0)