From ba3b0b7294f1fcf598f13999b87fa9f42793e5e7 Mon Sep 17 00:00:00 2001 From: Robert Prehn <3952444+prehnRA@users.noreply.github.com> Date: Wed, 23 Jun 2021 09:52:43 -0500 Subject: [PATCH 1/7] feat: Add dependabot for gitlab --- .gitlab-ci.yml | 36 ++++++++++++++++++++++++++++++++++++ .gitlab/dependabot.yml | 30 ++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 .gitlab/dependabot.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9cb2cc0e..b3e3f3f6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -108,3 +108,39 @@ deploy_commit_image_to_tag: - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA$IMAGE_TYPE $CI_REGISTRY_IMAGE:latest$IMAGE_TYPE - docker push $CI_REGISTRY_IMAGE:$BUILD_VERSION$IMAGE_TYPE - docker push $CI_REGISTRY_IMAGE:latest$IMAGE_TYPE + +.dependabot-gitlab: + image: + name: docker.io/andrcuns/dependabot-gitlab:0.4.3 + entrypoint: [""] + variables: + GIT_STRATEGY: none + PACKAGE_MANAGER: $CI_JOB_NAME + RAILS_ENV: production + SETTINGS__STANDALONE: "true" + SETTINGS__GITLAB_URL: $CI_SERVER_URL + SETTINGS__GITLAB_ACCESS_TOKEN: $GITLAB_TOKEN + before_script: + - cd /home/dependabot/app + script: + - bundle exec rake "dependabot:update[$PROJECT_PATH,$PACKAGE_MANAGER,$DIRECTORY]" + # only: + # - schedules + +npm: + extends: .dependabot-gitlab + only: + variables: + - $PACKAGE_MANAGER_SET =~ /(\bnpm|yarn\b)/ + +mix: + extends: .dependabot-gitlab + only: + variables: + - $PACKAGE_MANAGER_SET =~ /\bmix\b/ + +docker: + extends: .dependabot-gitlab + only: + variables: + - $PACKAGE_MANAGER_SET =~ /\bdocker\b/ diff --git a/.gitlab/dependabot.yml b/.gitlab/dependabot.yml new file mode 100644 index 00000000..d4def645 --- /dev/null +++ b/.gitlab/dependabot.yml @@ -0,0 +1,30 @@ +version: 2 +updates: +- package-ecosystem: docker + directory: "/" + schedule: + interval: "daily" +- package-ecosystem: mix + directory: "/apps/admin" + schedule: + interval: "daily" +- package-ecosystem: mix + directory: "/apps/app" + schedule: + interval: "daily" +- package-ecosystem: mix + directory: "/apps/content" + schedule: + interval: "daily" +- package-ecosystem: mix + directory: "/apps/core" + schedule: + interval: "daily" +- package-ecosystem: npm + directory: "/" + schedule: + interval: "daily" +- package-ecosystem: npm + directory: "/apps/app/assets" + schedule: + interval: "daily" From b5a5ede9652c6f8b8f5ee62d030cce4fc6121832 Mon Sep 17 00:00:00 2001 From: Robert Prehn <3952444+prehnRA@users.noreply.github.com> Date: Wed, 23 Jun 2021 09:55:43 -0500 Subject: [PATCH 2/7] fix: Test dependabot on branch before merging --- .gitlab-ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b3e3f3f6..7dd9a168 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -129,18 +129,18 @@ deploy_commit_image_to_tag: npm: extends: .dependabot-gitlab - only: - variables: - - $PACKAGE_MANAGER_SET =~ /(\bnpm|yarn\b)/ + # only: + # variables: + # - $PACKAGE_MANAGER_SET =~ /(\bnpm|yarn\b)/ mix: extends: .dependabot-gitlab - only: - variables: - - $PACKAGE_MANAGER_SET =~ /\bmix\b/ + # only: + # variables: + # - $PACKAGE_MANAGER_SET =~ /\bmix\b/ docker: extends: .dependabot-gitlab - only: - variables: - - $PACKAGE_MANAGER_SET =~ /\bdocker\b/ + # only: + # variables: + # - $PACKAGE_MANAGER_SET =~ /\bdocker\b/ From 038e2896b359f64a17f3b65b9bd625131fca2c8c Mon Sep 17 00:00:00 2001 From: Robert Prehn <3952444+prehnRA@users.noreply.github.com> Date: Wed, 23 Jun 2021 09:59:19 -0500 Subject: [PATCH 3/7] fix: Fix syntax in .gitlab-ci.yml --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7dd9a168..20334d9d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -109,7 +109,7 @@ deploy_commit_image_to_tag: - docker push $CI_REGISTRY_IMAGE:$BUILD_VERSION$IMAGE_TYPE - docker push $CI_REGISTRY_IMAGE:latest$IMAGE_TYPE -.dependabot-gitlab: +.dependabot_gitlab: &dependabot_gitlab image: name: docker.io/andrcuns/dependabot-gitlab:0.4.3 entrypoint: [""] @@ -128,19 +128,19 @@ deploy_commit_image_to_tag: # - schedules npm: - extends: .dependabot-gitlab + <<: *dependabot_gitlab # only: # variables: # - $PACKAGE_MANAGER_SET =~ /(\bnpm|yarn\b)/ mix: - extends: .dependabot-gitlab + <<: *dependabot_gitlab # only: # variables: # - $PACKAGE_MANAGER_SET =~ /\bmix\b/ docker: - extends: .dependabot-gitlab + <<: *dependabot_gitlab # only: # variables: # - $PACKAGE_MANAGER_SET =~ /\bdocker\b/ From 0860dcfe48103c82df6f21f0e45c407659c123f0 Mon Sep 17 00:00:00 2001 From: Robert Prehn <3952444+prehnRA@users.noreply.github.com> Date: Wed, 23 Jun 2021 16:21:10 -0500 Subject: [PATCH 4/7] fix: Set directory and project name for dependabot --- .gitlab-ci.yml | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20334d9d..45e585a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -123,24 +123,62 @@ deploy_commit_image_to_tag: before_script: - cd /home/dependabot/app script: - - bundle exec rake "dependabot:update[$PROJECT_PATH,$PACKAGE_MANAGER,$DIRECTORY]" + - bundle exec rake "dependabot:update[$CI_PROJECT_PATH,$PACKAGE_MANAGER,$DIRECTORY]" # only: # - schedules -npm: +npm-release-tools: <<: *dependabot_gitlab + variables: + DIRECTORY: "/" # only: # variables: # - $PACKAGE_MANAGER_SET =~ /(\bnpm|yarn\b)/ -mix: +npm-assets: <<: *dependabot_gitlab + variables: + DIRECTORY: "/apps/app/assets" + # only: + # variables: + # - $PACKAGE_MANAGER_SET =~ /(\bnpm|yarn\b)/ + +mix-admin: + <<: *dependabot_gitlab + variables: + DIRECTORY: "/apps/admin" + # only: + # variables: + # - $PACKAGE_MANAGER_SET =~ /\bmix\b/ + +mix-app: + <<: *dependabot_gitlab + variables: + DIRECTORY: "/apps/app" + # only: + # variables: + # - $PACKAGE_MANAGER_SET =~ /\bmix\b/ + +mix-core: + <<: *dependabot_gitlab + variables: + DIRECTORY: "/apps/core" + # only: + # variables: + # - $PACKAGE_MANAGER_SET =~ /\bmix\b/ + +mix-content: + <<: *dependabot_gitlab + variables: + DIRECTORY: "/apps/content" # only: # variables: # - $PACKAGE_MANAGER_SET =~ /\bmix\b/ docker: <<: *dependabot_gitlab + variables: + DIRECTORY: "/" # only: # variables: # - $PACKAGE_MANAGER_SET =~ /\bdocker\b/ From ad310c5fc29c23065c529b8cf661ae7475ba7d10 Mon Sep 17 00:00:00 2001 From: Robert Prehn <3952444+prehnRA@users.noreply.github.com> Date: Wed, 23 Jun 2021 16:26:41 -0500 Subject: [PATCH 5/7] fix: Update package manager names for dependabot --- .gitlab-ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45e585a9..b16ca866 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -115,7 +115,6 @@ deploy_commit_image_to_tag: entrypoint: [""] variables: GIT_STRATEGY: none - PACKAGE_MANAGER: $CI_JOB_NAME RAILS_ENV: production SETTINGS__STANDALONE: "true" SETTINGS__GITLAB_URL: $CI_SERVER_URL @@ -131,6 +130,7 @@ npm-release-tools: <<: *dependabot_gitlab variables: DIRECTORY: "/" + PACKAGE_MANAGER: javascript # only: # variables: # - $PACKAGE_MANAGER_SET =~ /(\bnpm|yarn\b)/ @@ -139,6 +139,7 @@ npm-assets: <<: *dependabot_gitlab variables: DIRECTORY: "/apps/app/assets" + PACKAGE_MANAGER: javascript # only: # variables: # - $PACKAGE_MANAGER_SET =~ /(\bnpm|yarn\b)/ @@ -147,6 +148,7 @@ mix-admin: <<: *dependabot_gitlab variables: DIRECTORY: "/apps/admin" + PACKAGE_MANAGER: "elixir:hex" # only: # variables: # - $PACKAGE_MANAGER_SET =~ /\bmix\b/ @@ -155,6 +157,7 @@ mix-app: <<: *dependabot_gitlab variables: DIRECTORY: "/apps/app" + PACKAGE_MANAGER: "elixir:hex" # only: # variables: # - $PACKAGE_MANAGER_SET =~ /\bmix\b/ @@ -163,6 +166,7 @@ mix-core: <<: *dependabot_gitlab variables: DIRECTORY: "/apps/core" + PACKAGE_MANAGER: "elixir:hex" # only: # variables: # - $PACKAGE_MANAGER_SET =~ /\bmix\b/ @@ -171,6 +175,7 @@ mix-content: <<: *dependabot_gitlab variables: DIRECTORY: "/apps/content" + PACKAGE_MANAGER: "elixir:hex" # only: # variables: # - $PACKAGE_MANAGER_SET =~ /\bmix\b/ @@ -179,6 +184,7 @@ docker: <<: *dependabot_gitlab variables: DIRECTORY: "/" + PACKAGE_MANAGER: docker # only: # variables: # - $PACKAGE_MANAGER_SET =~ /\bdocker\b/ From ce35c4ff19859bef638a6efe95648b2a735535a2 Mon Sep 17 00:00:00 2001 From: Robert Prehn <3952444+prehnRA@users.noreply.github.com> Date: Wed, 23 Jun 2021 16:48:50 -0500 Subject: [PATCH 6/7] fix: Use inheritence for dependabot settings --- .gitlab-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b16ca866..11e4f91c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,7 +127,7 @@ deploy_commit_image_to_tag: # - schedules npm-release-tools: - <<: *dependabot_gitlab + extends: .dependabot_gitlab variables: DIRECTORY: "/" PACKAGE_MANAGER: javascript @@ -136,7 +136,7 @@ npm-release-tools: # - $PACKAGE_MANAGER_SET =~ /(\bnpm|yarn\b)/ npm-assets: - <<: *dependabot_gitlab + extends: .dependabot_gitlab variables: DIRECTORY: "/apps/app/assets" PACKAGE_MANAGER: javascript @@ -145,7 +145,7 @@ npm-assets: # - $PACKAGE_MANAGER_SET =~ /(\bnpm|yarn\b)/ mix-admin: - <<: *dependabot_gitlab + extends: .dependabot_gitlab variables: DIRECTORY: "/apps/admin" PACKAGE_MANAGER: "elixir:hex" @@ -154,7 +154,7 @@ mix-admin: # - $PACKAGE_MANAGER_SET =~ /\bmix\b/ mix-app: - <<: *dependabot_gitlab + extends: .dependabot_gitlab variables: DIRECTORY: "/apps/app" PACKAGE_MANAGER: "elixir:hex" @@ -163,7 +163,7 @@ mix-app: # - $PACKAGE_MANAGER_SET =~ /\bmix\b/ mix-core: - <<: *dependabot_gitlab + extends: .dependabot_gitlab variables: DIRECTORY: "/apps/core" PACKAGE_MANAGER: "elixir:hex" @@ -172,7 +172,7 @@ mix-core: # - $PACKAGE_MANAGER_SET =~ /\bmix\b/ mix-content: - <<: *dependabot_gitlab + extends: .dependabot_gitlab variables: DIRECTORY: "/apps/content" PACKAGE_MANAGER: "elixir:hex" @@ -181,7 +181,7 @@ mix-content: # - $PACKAGE_MANAGER_SET =~ /\bmix\b/ docker: - <<: *dependabot_gitlab + extends: .dependabot_gitlab variables: DIRECTORY: "/" PACKAGE_MANAGER: docker From 4e8c3180be5ddda68e1bf79c38eb10429afeabed Mon Sep 17 00:00:00 2001 From: Robert Prehn <3952444+prehnRA@users.noreply.github.com> Date: Wed, 23 Jun 2021 16:59:34 -0500 Subject: [PATCH 7/7] fix: Only run dependabot on schedule --- .gitlab-ci.yml | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 11e4f91c..84b9c41a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -123,68 +123,68 @@ deploy_commit_image_to_tag: - cd /home/dependabot/app script: - bundle exec rake "dependabot:update[$CI_PROJECT_PATH,$PACKAGE_MANAGER,$DIRECTORY]" - # only: - # - schedules + only: + - schedules npm-release-tools: extends: .dependabot_gitlab variables: DIRECTORY: "/" PACKAGE_MANAGER: javascript - # only: - # variables: - # - $PACKAGE_MANAGER_SET =~ /(\bnpm|yarn\b)/ + only: + variables: + - $PACKAGE_MANAGER_SET =~ /(\bnpm|yarn\b)/ npm-assets: extends: .dependabot_gitlab variables: DIRECTORY: "/apps/app/assets" PACKAGE_MANAGER: javascript - # only: - # variables: - # - $PACKAGE_MANAGER_SET =~ /(\bnpm|yarn\b)/ + only: + variables: + - $PACKAGE_MANAGER_SET =~ /(\bnpm|yarn\b)/ mix-admin: extends: .dependabot_gitlab variables: DIRECTORY: "/apps/admin" PACKAGE_MANAGER: "elixir:hex" - # only: - # variables: - # - $PACKAGE_MANAGER_SET =~ /\bmix\b/ + only: + variables: + - $PACKAGE_MANAGER_SET =~ /\bmix\b/ mix-app: extends: .dependabot_gitlab variables: DIRECTORY: "/apps/app" PACKAGE_MANAGER: "elixir:hex" - # only: - # variables: - # - $PACKAGE_MANAGER_SET =~ /\bmix\b/ + only: + variables: + - $PACKAGE_MANAGER_SET =~ /\bmix\b/ mix-core: extends: .dependabot_gitlab variables: DIRECTORY: "/apps/core" PACKAGE_MANAGER: "elixir:hex" - # only: - # variables: - # - $PACKAGE_MANAGER_SET =~ /\bmix\b/ + only: + variables: + - $PACKAGE_MANAGER_SET =~ /\bmix\b/ mix-content: extends: .dependabot_gitlab variables: DIRECTORY: "/apps/content" PACKAGE_MANAGER: "elixir:hex" - # only: - # variables: - # - $PACKAGE_MANAGER_SET =~ /\bmix\b/ + only: + variables: + - $PACKAGE_MANAGER_SET =~ /\bmix\b/ docker: extends: .dependabot_gitlab variables: DIRECTORY: "/" PACKAGE_MANAGER: docker - # only: - # variables: - # - $PACKAGE_MANAGER_SET =~ /\bdocker\b/ + only: + variables: + - $PACKAGE_MANAGER_SET =~ /\bdocker\b/