From 68ca28e4fc914ee178a2fc8428ceb38ee5e0ac05 Mon Sep 17 00:00:00 2001 From: Steve Flanders Date: Mon, 29 Mar 2021 13:50:22 -0400 Subject: [PATCH] Add Python dependencies to dependabot (#207) --- .github/dependabot.yml | 18 +++++++++++++++--- Makefile | 16 ++++++++++------ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 33d1ea90f8c..5c211c12260 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,12 +5,24 @@ updates: - package-ecosystem: "gomod" directory: "/" schedule: - interval: "weekly" + interval: "daily" - package-ecosystem: "gomod" directory: "/examples/prometheus-federation/prom-counter" schedule: - interval: "weekly" + interval: "daily" - package-ecosystem: "gomod" directory: "/examples/splunk-hec/logging" schedule: - interval: "weekly" + interval: "daily" + - package-ecosystem: "gomod" + directory: "/tests" + schedule: + interval: "daily" + - package-ecosystem: "pip" + directory: "/internal/buildscripts/packaging/release" + schedule: + interval: "daily" + - package-ecosystem: "pip" + directory: "/internal/buildscripts/packaging/tests" + schedule: + interval: "daily" diff --git a/Makefile b/Makefile index bbf443bb830..99d89931e8d 100644 --- a/Makefile +++ b/Makefile @@ -6,9 +6,6 @@ ADDLICENSE= addlicense ALL_DOC := $(shell find . \( -name "*.md" -o -name "*.yaml" \) \ -type f | sort) -# ALL_MODULES includes ./* dirs (excludes . dir) -ALL_MODULES := $(shell find . -type f -name "go.mod" -exec dirname {} \; | sort | egrep '^./' ) - # All source code excluding any third party code and excluding the testbed. # This is the code that we want to run tests for and lint, staticcheck, etc. ALL_SRC := $(shell find . -name '*.go' \ @@ -107,6 +104,9 @@ checklicense: echo "Check License finished successfully"; \ fi +# ALL_MODULES includes ./* dirs (excludes . dir) +ALL_GO_MODULES := $(shell find . -type f -name "go.mod" -exec dirname {} \; | sort | egrep '^./' ) +ALL_PYTHON_DEPS := $(shell find . -type f \( -name "setup.py" -o -name "requirements.txt" \) -exec dirname {} \; | sort | egrep '^./') DEPENDABOT_PATH=./.github/dependabot.yml .PHONY: gendependabot gendependabot: @@ -115,10 +115,14 @@ gendependabot: @echo "version: 2" >> ${DEPENDABOT_PATH} @echo "updates:" >> ${DEPENDABOT_PATH} @echo "Add entry for \"/\"" - @echo " - package-ecosystem: \"gomod\"\n directory: \"/\"\n schedule:\n interval: \"weekly\"" >> ${DEPENDABOT_PATH} - @set -e; for dir in $(ALL_MODULES); do \ + @echo " - package-ecosystem: \"gomod\"\n directory: \"/\"\n schedule:\n interval: \"daily\"" >> ${DEPENDABOT_PATH} + @set -e; for dir in $(ALL_GO_MODULES); do \ + (echo "Add entry for \"$${dir:1}\"" && \ + echo " - package-ecosystem: \"gomod\"\n directory: \"$${dir:1}\"\n schedule:\n interval: \"daily\"" >> ${DEPENDABOT_PATH} ); \ + done + @set -e; for dir in $(ALL_PYTHON_DEPS); do \ (echo "Add entry for \"$${dir:1}\"" && \ - echo " - package-ecosystem: \"gomod\"\n directory: \"$${dir:1}\"\n schedule:\n interval: \"weekly\"" >> ${DEPENDABOT_PATH} ); \ + echo " - package-ecosystem: \"pip\"\n directory: \"$${dir:1}\"\n schedule:\n interval: \"daily\"" >> ${DEPENDABOT_PATH} ); \ done .PHONY: misspell