diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2019-06-27 23:22:53 +1000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-06-27 23:56:49 +1000 |
| commit | 2b4aaab11d880942f41825ecd4730f5131acec8e (patch) | |
| tree | 42990475d98b68a01aafdce6c2f4d9b332486c23 | |
| parent | 0258d8a8607606e9b4c2bb99ede62e7eee94b8ab (diff) | |
| download | gitlab-shell-2b4aaab11d880942f41825ecd4730f5131acec8e.tar.gz | |
Use new Makefile targets in .gitlab-ci.yml
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b91d44..6bbd334 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,8 +15,7 @@ before_script: # primarily regression tests for particular versions of Ruby. # # The full rspec suite is also run against each suppported golang version - - cp bin/gitlab-shell-ruby bin/gitlab-shell - - bundle exec rspec --color --tag ~go --format d spec + - make test_ruby rspec: <<: *rspec_definition @@ -25,9 +24,9 @@ rspec: except: - tags -rubocop: +verify_ruby: script: - - bundle exec rubocop + - make verify_ruby tags: - ruby except: @@ -77,13 +76,11 @@ rspec:ruby2.1: script: - go version - which go - - bin/compile - - support/go-test - - support/go-format check + - make build verify_golang test_golang # Run the full Ruby test suite in the "go" tests. As more functionality is # migrated into these tests and out of Ruby, the amount of work here will # reduce - - bundle exec rspec --color --format d spec + - make test_ruby go:1.11: <<: *go_definition @@ -111,7 +108,6 @@ codequality: artifacts: paths: [codeclimate.json] - sast: image: docker:stable variables: |