From fc99a6a1e6f20e170f33a96e19d93139264b8e7b Mon Sep 17 00:00:00 2001 From: Erick Hitter <git-contrib@ethitter.com> Date: Sat, 16 Jul 2022 14:51:33 -0700 Subject: [PATCH] Prepare for merge [skip ci] --- plugins/default-redis.yml | 10 ++-------- plugins/default.yml | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/plugins/default-redis.yml b/plugins/default-redis.yml index 5e07498..a1a5567 100644 --- a/plugins/default-redis.yml +++ b/plugins/default-redis.yml @@ -1,13 +1,7 @@ include: + - remote: https://git-cdn.e15r.co/gitlab/ci/wordpress/-/raw/main/plugins/templates/stages.yml - remote: https://git-cdn.e15r.co/gitlab/ci/wordpress/-/raw/main/plugins/templates/variables.yml - 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 "" + - remote: https://git-cdn.e15r.co/gitlab/ci/wordpress/-/raw/main/plugins/templates/gitlab-tools.yml diff --git a/plugins/default.yml b/plugins/default.yml index 277c45a..39a5a9e 100644 --- a/plugins/default.yml +++ b/plugins/default.yml @@ -1,7 +1,7 @@ include: - - remote: https://git.ethitter.com/gitlab/ci/wordpress/-/raw/add/sast-dep-gl/plugins/templates/stages.yml + - remote: https://git-cdn.e15r.co/gitlab/ci/wordpress/-/raw/main/plugins/templates/stages.yml - remote: https://git-cdn.e15r.co/gitlab/ci/wordpress/-/raw/main/plugins/templates/variables.yml - 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/-/raw/add/sast-dep-gl/plugins/templates/gitlab-tools.yml + - remote: https://git-cdn.e15r.co/gitlab/ci/wordpress/-/raw/main/plugins/templates/gitlab-tools.yml -- GitLab