diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-07-08 09:28:40 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-07-08 09:28:40 +0000 |
| commit | d33e5dc65900b86252b23f439131a4cbb1707d67 (patch) | |
| tree | 915ac536ad0c76dd118286f20e8d210d5fab66a5 | |
| parent | 31adddadee3b56d94356d178cc436fdc5dd7455c (diff) | |
| parent | 0bfa208588e86d3fb5eaac7383391a1bd85f2e14 (diff) | |
Merge branch 'lint-test-stage' into 'master'
Move lint job to test stage
See merge request gitlab-org/security-products/license-management!182
| -rw-r--r-- | .gitlab/build.yml | 8 | ||||
| -rw-r--r-- | .gitlab/test.yml | 9 | ||||
| -rw-r--r-- | spec/fixtures/expected/js/bower/v2.1.json | 4 |
3 files changed, 11 insertions, 10 deletions
diff --git a/.gitlab/build.yml b/.gitlab/build.yml index 6cc7807..a7c2dab 100644 --- a/.gitlab/build.yml +++ b/.gitlab/build.yml @@ -35,11 +35,3 @@ build-mvn-pkg: script: - cd spec/fixtures/java/example/ && mvn deploy -s settings.xml allow_failure: true - -lint: - stage: build - image: ruby:alpine - script: - - apk add build-base shellcheck - - bin/setup - - bin/lint diff --git a/.gitlab/test.yml b/.gitlab/test.yml index ba09df2..98bd92f 100644 --- a/.gitlab/test.yml +++ b/.gitlab/test.yml @@ -18,6 +18,15 @@ size: - test "$MAX_SIZE" -gt "$CURRENT_SIZE" needs: ['build-docker-image'] +lint: + stage: test + image: ruby:alpine + script: + - apk add build-base shellcheck + - bin/setup + - bin/lint + needs: [] + .rspec: stage: test script: diff --git a/spec/fixtures/expected/js/bower/v2.1.json b/spec/fixtures/expected/js/bower/v2.1.json index cf41514..78570ca 100644 --- a/spec/fixtures/expected/js/bower/v2.1.json +++ b/spec/fixtures/expected/js/bower/v2.1.json @@ -35,7 +35,7 @@ "dependencies": [ { "name": "cli", - "version": "6.14.5", + "version": "6.14.6", "package_manager": "bower", "path": "bower.json", "licenses": [ @@ -128,4 +128,4 @@ ] } ] -}
\ No newline at end of file +} |