diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 184a31c6..3b9b66d1 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -14,7 +14,7 @@ steps: if: build.branch != "master" - wait: - if: build.pull_request.repository.fork != true && build.branch !~ /^(dependabot|renovate)\/.*/ + if: build.pull_request.repository.fork != true && build.branch !~ /^renovate\/.*/ # Manual intervention by team required to deploy for forked PRs (prevent secret leakage). - block: "Public fork needs approval" @@ -32,7 +32,7 @@ steps: - label: ":rocket: Setup Deployment" command: ".buildkite/deployment.sh | buildkite-agent pipeline upload" depends_on: ~ - if: build.branch != "master" && build.branch !~ /^(dependabot|renovate)\/.*/ && build.pull_request.repository.fork != true + if: build.branch != "master" && build.branch !~ /^renovate\/.*/ && build.pull_request.repository.fork != true # Removed dependency optimisation for forked PRs to enforce block step. - label: ":rocket: Setup Deployment" diff --git a/.buildkite/steps/buildimages.sh b/.buildkite/steps/buildimages.sh index 53d5cf68..dde48fc5 100755 --- a/.buildkite/steps/buildimages.sh +++ b/.buildkite/steps/buildimages.sh @@ -33,7 +33,7 @@ cat << EOF EOF else cat << EOF - if: build.branch !~ /^(dependabot|renovate)\/.*/ + if: build.branch !~ /^renovate\/.*/ EOF fi done diff --git a/.dependabot/config.yml b/.dependabot/config.yml deleted file mode 100644 index c13d81be..00000000 --- a/.dependabot/config.yml +++ /dev/null @@ -1,50 +0,0 @@ -version: 1 -update_configs: - - package_manager: "go:modules" - directory: "/" - update_schedule: "daily" - commit_message: - prefix: "[MISC] " - include_scope: true - - package_manager: "javascript" - directory: "/web" - update_schedule: "live" - commit_message: - prefix: "[MISC] " - include_scope: true - - package_manager: "ruby:bundler" - directory: "/docs" - update_schedule: "live" - commit_message: - prefix: "[MISC] " - include_scope: true - - package_manager: "docker" - directory: "/" - update_schedule: "daily" - commit_message: - prefix: "[MISC] " - include_scope: true - - package_manager: "docker" - directory: "/internal/suites/example/compose/authelia" - update_schedule: "daily" - commit_message: - prefix: "[MISC] " - include_scope: true - - package_manager: "docker" - directory: "/internal/suites/example/compose/haproxy" - update_schedule: "daily" - commit_message: - prefix: "[MISC] " - include_scope: true - - package_manager: "docker" - directory: "/internal/suites/example/compose/duo-api" - update_schedule: "daily" - commit_message: - prefix: "[MISC] " - include_scope: true - - package_manager: "docker" - directory: "/internal/suites/example/compose/kind" - update_schedule: "daily" - commit_message: - prefix: "[MISC] " - include_scope: true \ No newline at end of file diff --git a/.github/probot.js b/.github/probot.js index 8f49a507..4916eca8 100644 --- a/.github/probot.js +++ b/.github/probot.js @@ -4,10 +4,6 @@ on('pull_request.opened') context => context.payload.pull_request.head.label.slice(0, 9) === 'authelia:' ) - .filter( - context => - context.payload.pull_request.head.ref.slice(0, 11) !== 'dependabot/' - ) .filter( context => context.payload.pull_request.head.ref.slice(0, 9) !== 'renovate/' diff --git a/go.sum b/go.sum index f78c8db6..2077648c 100644 --- a/go.sum +++ b/go.sum @@ -375,11 +375,13 @@ github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v1.1.1 h1:KfztREH0tPxJJ+geloSLaAkaPkr4ki2Er5quFV1TDo4= github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk=