From d163f39096da9245f519af0436b25725e706a03b Mon Sep 17 00:00:00 2001 From: Erick Hitter <git-contrib@ethitter.com> Date: Sat, 16 Jul 2022 14:28:00 -0700 Subject: [PATCH] Simplify, since all extend a shared base --- plugins/default-redis.yml | 8 ++++++++ plugins/default.yml | 9 ++++++++- plugins/templates/gitlab-tools.yml | 9 --------- 3 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 plugins/templates/gitlab-tools.yml diff --git a/plugins/default-redis.yml b/plugins/default-redis.yml index 19f1490..5e07498 100644 --- a/plugins/default-redis.yml +++ b/plugins/default-redis.yml @@ -3,3 +3,11 @@ include: - remote: https://git-cdn.e15r.co/gitlab/ci/wordpress/-/raw/main/plugins/templates/cache.yml - remote: https://git-cdn.e15r.co/gitlab/ci/wordpress/-/raw/main/plugins/templates/before-script-redis.yml - remote: https://git-cdn.e15r.co/gitlab/ci/wordpress/-/raw/main/plugins/templates/matrix-redis.yml + - template: Security/SAST.gitlab-ci.yml + - template: Security/Dependency-Scanning.gitlab-ci.yml + +dependency_scanning: + before_script: echo "" + +sast: + before_script: echo "" diff --git a/plugins/default.yml b/plugins/default.yml index d5e7cae..ee9ee5b 100644 --- a/plugins/default.yml +++ b/plugins/default.yml @@ -3,4 +3,11 @@ include: - remote: https://git-cdn.e15r.co/gitlab/ci/wordpress/-/raw/main/plugins/templates/cache.yml - remote: https://git-cdn.e15r.co/gitlab/ci/wordpress/-/raw/main/plugins/templates/before-script.yml - remote: https://git-cdn.e15r.co/gitlab/ci/wordpress/-/raw/main/plugins/templates/matrix.yml - - remote: https://git.ethitter.com/gitlab/ci/wordpress/-/blob/add/sast-dep-gl/plugins/templates/gitlab-tools.yml + - template: Security/SAST.gitlab-ci.yml + - template: Security/Dependency-Scanning.gitlab-ci.yml + +dependency_scanning: + before_script: echo "" + +sast: + before_script: echo "" diff --git a/plugins/templates/gitlab-tools.yml b/plugins/templates/gitlab-tools.yml deleted file mode 100644 index f4b4d8c..0000000 --- a/plugins/templates/gitlab-tools.yml +++ /dev/null @@ -1,9 +0,0 @@ -include: - - template: Security/SAST.gitlab-ci.yml - - template: Security/Dependency-Scanning.gitlab-ci.yml - -dependency_scanning: - before_script: echo "" - -sast: - before_script: echo "" -- GitLab