diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-11-24 11:16:46 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-11-25 13:44:36 +0300 |
| commit | 5fcc0fcab5238a1bfff328c37d5afc55b802b9e0 (patch) | |
| tree | be82690eef725a97bffe331508ed5ac8dc00e147 /.gitlab-ci.yml | |
| parent | 7eabd8ac6d102e31493b4c97dc3220f3b589fab1 (diff) | |
ci: Merge "proto" and "verify" jobs
We have two jobs which execute the "verify" and the "proto" targets,
respectively to check whether Go modules are tidy, whether the NOTICE
file is up-to-date, whether Protobuf files have been generated and to
run linting. The "verify" target does all the "proto" target already
does though, so the second job to explicitly call this target is
duplicating functionality we already have. The only additional thing it
brings to the table is that it will upload changed Protobuf files as
artifacts if this target fails.
Merge the "proto" job into the "verify" job to fix this duplication.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1f0ec779..d7dcab0ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -140,18 +140,6 @@ build:binaries: matrix: - GO_VERSION: [ "1.16", "1.17" ] -proto: - <<: *cache_definition - stage: test - script: - - make proto no-changes - artifacts: - paths: - - _build/proto.diff - - ruby/proto/gitaly/* - - proto/go/gitalypb/* - when: on_failure - test: <<: *test_definition <<: *postgres_definition @@ -248,6 +236,12 @@ verify: stage: test script: - make verify + artifacts: + paths: + - _build/proto.diff + - ruby/proto/gitaly/* + - proto/go/gitalypb/* + when: on_failure lint: stage: test |