Commit 2b4aaab1 authored by Ash McKenzie's avatar Ash McKenzie

Use new Makefile targets in .gitlab-ci.yml

parent 0258d8a8
...@@ -15,8 +15,7 @@ before_script: ...@@ -15,8 +15,7 @@ before_script:
# primarily regression tests for particular versions of Ruby. # primarily regression tests for particular versions of Ruby.
# #
# The full rspec suite is also run against each suppported golang version # The full rspec suite is also run against each suppported golang version
- cp bin/gitlab-shell-ruby bin/gitlab-shell - make test_ruby
- bundle exec rspec --color --tag ~go --format d spec
rspec: rspec:
<<: *rspec_definition <<: *rspec_definition
...@@ -25,9 +24,9 @@ rspec: ...@@ -25,9 +24,9 @@ rspec:
except: except:
- tags - tags
rubocop: verify_ruby:
script: script:
- bundle exec rubocop - make verify_ruby
tags: tags:
- ruby - ruby
except: except:
...@@ -77,13 +76,11 @@ rspec:ruby2.1: ...@@ -77,13 +76,11 @@ rspec:ruby2.1:
script: script:
- go version - go version
- which go - which go
- bin/compile - make build verify_golang test_golang
- support/go-test
- support/go-format check
# Run the full Ruby test suite in the "go" tests. As more functionality is # 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 # migrated into these tests and out of Ruby, the amount of work here will
# reduce # reduce
- bundle exec rspec --color --format d spec - make test_ruby
go:1.11: go:1.11:
<<: *go_definition <<: *go_definition
...@@ -111,7 +108,6 @@ codequality: ...@@ -111,7 +108,6 @@ codequality:
artifacts: artifacts:
paths: [codeclimate.json] paths: [codeclimate.json]
sast: sast:
image: docker:stable image: docker:stable
variables: variables:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment