diff options
| author | mo khan <mo.khan@gmail.com> | 2020-09-10 19:31:53 +0000 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-09-10 19:31:53 +0000 |
| commit | aa44fb0d5ca05da6780869fb187985a4600cb969 (patch) | |
| tree | 850ca482ea48dca003c7c4d582376ec5618d5520 /.gitlab | |
| parent | d4da2eff19bd210d18b0dbb80aa305c6a955a644 (diff) | |
| parent | f4edc9a8e9c0a94056ecb80ec6333dfa42857a14 (diff) | |
Merge branch 'fix-go-patch-install-dir' into 'master'v3.25.4
Use golang_version as install directory for Go
See merge request gitlab-org/security-products/license-management!217
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/test.yml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/.gitlab/test.yml b/.gitlab/test.yml index 1dbc2c9..e44a90d 100644 --- a/.gitlab/test.yml +++ b/.gitlab/test.yml @@ -73,10 +73,17 @@ integration-go: RSPEC_DIR: spec/integration/go needs: ['build-docker-image'] -integration-java: +integration-java-gradle: extends: .rspec variables: - RSPEC_DIR: spec/integration/java + RSPEC_DIR: spec/integration/java/gradle_spec.rb + needs: + - build-docker-image + +integration-java-maven: + extends: .rspec + variables: + RSPEC_DIR: spec/integration/java/maven_spec.rb needs: - build-docker-image - build-mvn-pkg |