CI update

balping · balping · commit d7a44c3b5829 · 2020-06-06T16:17:04.000Z
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -5,9 +5,9 @@ cache:
 stages:
   - test
 
-test:7.2:
+test:7.4:
   stage: test
-  image: php:7.2
+  image: php:7.4
   before_script:
   - bash ci/docker_install.sh > /dev/null
   - wget https://composer.github.io/installer.sig -O - -q | tr -d '\n' > installer.sig
@@ -19,23 +19,5 @@ test:7.2:
   script:
   - phpunit --configuration phpunit.xml  --coverage-text --colors=never
 
-dependency_scanning:
-  stage: test
-  image: docker:stable
-  variables:
-    DOCKER_DRIVER: overlay2
-  allow_failure: true
-  services:
-    - docker:stable-dind
-  script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env DEP_SCAN_DISABLE_REMOTE_CHECKS="${DEP_SCAN_DISABLE_REMOTE_CHECKS:-false}"
-        --volume "$PWD:/code"
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/dependency-scanning:$SP_VERSION" /code
-  artifacts:
-    paths: [gl-dependency-scanning-report.json]
-  except:
-    variables:
-      - $DEPENDENCY_SCANNING_DISABLED
+include:
+  - template: Dependency-Scanning.gitlab-ci.yml
