This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git


The following commit(s) were added to refs/heads/main by this push:
     new e91eb6f  Remove `merge-dependabot` workflow (#311)
e91eb6f is described below

commit e91eb6f90affac2699e2054dbe2dc59f871a5ebc
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Wed Apr 16 22:31:00 2025 +0200

    Remove `merge-dependabot` workflow (#311)
    
    * Remove `merge-dependabot` workflow
    
    In this repository, we don't need changelog entries. I would therefore 
propose to disable the `merge-dependabot` workflow and merge upgrades manually.
    
    * Run Dependabot weekly
---
 .github/dependabot.yaml                 | 18 ++++++++++---
 .github/workflows/build.yaml            |  1 -
 .github/workflows/merge-dependabot.yaml | 45 ---------------------------------
 3 files changed, 14 insertions(+), 50 deletions(-)

diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
index 72afaf0..b17aa7a 100644
--- a/.github/dependabot.yaml
+++ b/.github/dependabot.yaml
@@ -30,8 +30,11 @@ updates:
       - "/"
       - "log4j-samples-graalvm"
     schedule:
-      interval: daily
-    open-pull-requests-limit: 10
+      interval: weekly
+    groups:
+      all:
+        patterns:
+          - "*"
     registries:
       - maven-central
 
@@ -39,8 +42,11 @@ updates:
     directories:
       - "/"
     schedule:
-      interval: daily
-    open-pull-requests-limit: 10
+      interval: weekly
+    groups:
+      all:
+        patterns:
+          - "*"
     registries:
       - maven-central
 
@@ -48,3 +54,7 @@ updates:
     directory: "/"
     schedule:
       interval: weekly
+    groups:
+      all:
+        patterns:
+          - "*"
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index ae600a2..fcf47d7 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -36,5 +36,4 @@ permissions: read-all
 jobs:
 
   integration-test:
-    if: github.actor != 'dependabot[bot]'
     uses: 
apache/logging-log4j-samples/.github/workflows/integration-test.yaml@main
diff --git a/.github/workflows/merge-dependabot.yaml 
b/.github/workflows/merge-dependabot.yaml
deleted file mode 100644
index 27ec773..0000000
--- a/.github/workflows/merge-dependabot.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to you under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-name: merge-dependabot
-
-on:
-  pull_request_target:
-    paths-ignore:
-      - "**.adoc"
-      - "**.md"
-      - "**.txt"
-
-permissions: read-all
-
-jobs:
-
-  integration-test:
-    if: github.repository == 'apache/logging-log4j-samples' && 
github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
-    uses: 
apache/logging-log4j-samples/.github/workflows/integration-test.yaml@main
-    with:
-      # When running on `pull_request_target` use the PR branch, not the 
target branch
-      samples-ref: ${{ github.head_ref }}
-
-  merge-dependabot:
-    needs: integration-test
-    uses: 
apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@main
-    permissions:
-      contents: write                                         # to push 
changelog commits
-      pull-requests: write                                    # to close the PR
-    secrets:
-      GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}   # to sign commits

Reply via email to