From 28ca97a9cbebf6f931c804dfe4bb7e8c0c947100 Mon Sep 17 00:00:00 2001 From: Dominic Sayers Date: Tue, 29 May 2018 14:03:37 +0100 Subject: [PATCH 1/4] Add GitLab CI for dependencies --- .gitlab-ci.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..4bfa34e --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,16 @@ +dependency_scanning: + 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] From 7a47690fa6fde690f138910900091e3344f6038a Mon Sep 17 00:00:00 2001 From: Dominic Sayers Date: Tue, 29 May 2018 14:20:34 +0100 Subject: [PATCH 2/4] Fix dependency status badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 18f3185..9ddb062 100755 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![Build Status](https://travis-ci.org/dominicsayers/machinist.svg?branch=master)](https://travis-ci.org/dominicsayers/machinist) [![Code Climate](https://codeclimate.com/github/dominicsayers/machinist/badges/gpa.svg)](https://codeclimate.com/github/dominicsayers/machinist) [![Test Coverage](https://codeclimate.com/github/dominicsayers/machinist/badges/coverage.svg)](https://codeclimate.com/github/dominicsayers/machinist/coverage) -[![Dependency Status](https://gemnasium.com/badges/github.com/dominicsayers/machinist.svg)](https://gemnasium.com/github.com/dominicsayers/machinist) +[![Dependency Status](https://gemnasium.com/badges/github.com/dominicsayers/pipeline.svg)](https://gitlab.com/dominicsayers/machinist) [![Security](https://hakiri.io/github/dominicsayers/machinist/master.svg)](https://hakiri.io/github/dominicsayers/machinist/master) - [Home page](https://github.com/dominicsayers/machinist) From 1566e1ed1c7811b51bea4e5a205150031c4ce725 Mon Sep 17 00:00:00 2001 From: Dominic Sayers Date: Tue, 29 May 2018 14:22:25 +0100 Subject: [PATCH 3/4] Fix dependency status badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9ddb062..0e81c7f 100755 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![Build Status](https://travis-ci.org/dominicsayers/machinist.svg?branch=master)](https://travis-ci.org/dominicsayers/machinist) [![Code Climate](https://codeclimate.com/github/dominicsayers/machinist/badges/gpa.svg)](https://codeclimate.com/github/dominicsayers/machinist) [![Test Coverage](https://codeclimate.com/github/dominicsayers/machinist/badges/coverage.svg)](https://codeclimate.com/github/dominicsayers/machinist/coverage) -[![Dependency Status](https://gemnasium.com/badges/github.com/dominicsayers/pipeline.svg)](https://gitlab.com/dominicsayers/machinist) +[![Dependency Status](https://gitlab.com/dominicsayers/machinist/badges/develop/build.svg)](https://gitlab.com/dominicsayers/machinist) [![Security](https://hakiri.io/github/dominicsayers/machinist/master.svg)](https://hakiri.io/github/dominicsayers/machinist/master) - [Home page](https://github.com/dominicsayers/machinist) From a54787f17a529d0aabc09c832a17330cbb35a9b5 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" Date: Tue, 29 May 2018 13:30:45 +0000 Subject: [PATCH 4/4] Upgrade rubocop to version 0.56.0 --- Gemfile | 2 +- machinist.gemspec | 0 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 Gemfile mode change 100755 => 100644 machinist.gemspec diff --git a/Gemfile b/Gemfile old mode 100755 new mode 100644 index 2535d79..405d855 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ group :development do gem 'guard-rubocop', require: false gem 'guard-rubycritic', require: false gem 'rdoc', require: false - gem 'rubocop', '= 0.54', require: false + gem 'rubocop', '= 0.56.0', require: false gem 'rubocop-rspec', require: false end diff --git a/machinist.gemspec b/machinist.gemspec old mode 100755 new mode 100644