Skip to content

Commit 06ce29b

Browse files
Igor DrozdovGitLab
Igor Drozdov
authored and
GitLab
committed
Merge branch 'id-restructure-ci-jobs' into 'main'
Restructure CI jobs See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/1097 Merged-by: Igor Drozdov <[email protected]> Approved-by: Vasilii Iakliushin <[email protected]> Approved-by: Ash McKenzie <[email protected]> Reviewed-by: Ash McKenzie <[email protected]>
2 parents a2b4bfd + f8880e6 commit 06ce29b

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

.gitlab-ci.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ include:
77

88
stages:
99
- prepare
10+
- lint
1011
- test
12+
- post-test
1113

1214
variables:
1315
FF_USE_FASTZIP: 'true'
@@ -174,10 +176,12 @@ race:
174176
- make test_golang_race
175177

176178
code_quality:
179+
stage: lint
177180
extends: .use-docker-in-docker
178181
rules: *workflow_rules
179182

180183
code_navigation:
184+
stage: post-test
181185
image: sourcegraph/lsif-go:v1.9
182186
allow_failure: true
183187
script:
@@ -188,17 +192,21 @@ code_navigation:
188192

189193
# SAST
190194
semgrep-sast:
195+
stage: lint
191196
rules: *workflow_rules
192197

193198
# Dependency Scanning
194199
gemnasium-dependency_scanning:
200+
stage: lint
195201
rules: *workflow_rules
196202

197203
# Secret Detection
198204
secret_detection:
205+
stage: lint
199206
rules: *workflow_rules
200207

201208
build-package-and-qa:
209+
stage: post-test
202210
trigger:
203211
project: 'gitlab-org/build/omnibus-gitlab-mirror'
204212
branch: 'master'
@@ -230,13 +238,14 @@ build-package-and-qa:
230238
needs: []
231239

232240
modules:tidy:
241+
stage: lint
233242
needs: ['modules:download']
234243
script:
235244
- go mod tidy
236245
- git diff --exit-code go.mod go.sum
237246

238247
lint:
239-
stage: test
248+
stage: lint
240249
script:
241250
# Write the code coverage report to gl-code-quality-report.json
242251
# and print linting issues to stdout in the format: path/to/file:line description
@@ -252,7 +261,7 @@ lint:
252261
- gl-code-quality-report.json
253262

254263
nilaway:
255-
stage: test
264+
stage: lint
256265
before_script:
257266
- go install go.uber.org/nilaway/cmd/nilaway@latest
258267
script:

0 commit comments

Comments
 (0)