This is an automated email from the ASF dual-hosted git repository. ppkarwasz pushed a commit to branch remove/2.25.x/merge-dependabot in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit a089a4a255ea9031c73fa78369f336372aac44a4 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Thu Sep 3 12:12:39 2026 +0200 Remove workflows that are unused on `2.25.x` GitHub only evaluates `schedule`, `issues`, `issue_comment` and `workflow_run` triggers on the default branch, so the copies of `close-stale`, `labeler`, `develocity-publish-build-scans` and `process-dependabot` on this branch never ran. `merge-dependabot` has been superseded by the analyze/process pair. The `deploy-site` workflow now only stages the website for `release/2.25.*` branches; the staging site for `2.x` and the production site are deployed from the default branch. Assisted-By: Claude Fable 5.1 <[email protected]> Claude-Session: https://claude.ai/code/session_014QXFCr2hQv3zoVf7wo5Lab --- .github/workflows/analyze-dependabot.yaml | 3 + .github/workflows/close-stale.yaml | 42 ------------- .github/workflows/deploy-site.yaml | 46 ++------------- .../workflows/develocity-publish-build-scans.yaml | 42 ------------- .github/workflows/labeler.yaml | 69 ---------------------- .github/workflows/merge-dependabot.yaml | 52 ---------------- .github/workflows/process-dependabot.yaml | 48 --------------- 7 files changed, 7 insertions(+), 295 deletions(-) diff --git a/.github/workflows/analyze-dependabot.yaml b/.github/workflows/analyze-dependabot.yaml index cd991d3637..92dae2a0b0 100644 --- a/.github/workflows/analyze-dependabot.yaml +++ b/.github/workflows/analyze-dependabot.yaml @@ -18,6 +18,9 @@ name: "Dependabot Analyze PR" on: + # `pull_request` runs the workflow file from the PR merge commit, so this copy applies to PRs against this branch. + # The follow-up "Dependabot Process PR" workflow is triggered by `workflow_run`, which GitHub only evaluates + # on the default branch, so it does not need a copy here. pull_request: # Default permissions for each job. diff --git a/.github/workflows/close-stale.yaml b/.github/workflows/close-stale.yaml deleted file mode 100644 index 50870630b7..0000000000 --- a/.github/workflows/close-stale.yaml +++ /dev/null @@ -1,42 +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: 'Close stale issues' -on: - schedule: - - cron: '30 1 * * *' - workflow_dispatch: - -permissions: - issues: write - -jobs: - stale: - runs-on: ubuntu-latest - steps: - - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0 - with: - # Labels need to match with the ones in `labeler.yaml`! - only-labels: waiting-for-user - days-before-stale: 60 - days-before-close: 7 - stale-issue-message: > - This issue is stale because it has been waiting for your feedback for more than 60 days. - The Apache Logging Services community values every submitted issue, but without additional information from you, - we are unable to provide a solution to your problem. - - Please comment on this issue or it will be closed in 7 days. diff --git a/.github/workflows/deploy-site.yaml b/.github/workflows/deploy-site.yaml index 59aba57c8f..e25e3fbfd1 100644 --- a/.github/workflows/deploy-site.yaml +++ b/.github/workflows/deploy-site.yaml @@ -19,55 +19,17 @@ name: deploy-site on: push: + # A minor version branch only stages the website for its own release branches. + # The staging site for `2.x` and the production site (from `2.x-site-pro`) are deployed by the workflow on `2.x`. branches: - - "2.x" - - "2.x-site-pro" - - "release/2*" - paths-ignore: - - "**.md" - - "**.txt" + - "release/2.25.*" permissions: read-all jobs: - deploy-site-stg: - if: github.repository == 'apache/logging-log4j2' && github.ref_name == '2.x' - uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@gha/v0 - # Secrets for committing the generated site - secrets: - GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }} - # Write permissions for committing the generated site - permissions: - contents: write - with: - asf-yaml-content: | - staging: - profile: ~ - whoami: ${{ github.ref_name }}-site-stg-out - subdir: content/log4j/2.x - install-required: true - target-branch: ${{ github.ref_name }}-site-stg-out - - deploy-site-pro: - if: github.repository == 'apache/logging-log4j2' && github.ref_name == '2.x-site-pro' - uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@gha/v0 - # Secrets for committing the generated site - secrets: - GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }} - # Write permissions for committing the generated site - permissions: - contents: write - with: - asf-yaml-content: | - publish: - whoami: ${{ github.ref_name }}-out - subdir: content/log4j/2.x - install-required: true - target-branch: ${{ github.ref_name }}-out - export-version: - if: github.repository == 'apache/logging-log4j2' && startsWith(github.ref_name, 'release/') + if: github.repository == 'apache/logging-log4j2' runs-on: ubuntu-latest outputs: version: ${{ steps.export-version.outputs.version }} diff --git a/.github/workflows/develocity-publish-build-scans.yaml b/.github/workflows/develocity-publish-build-scans.yaml deleted file mode 100644 index 2a87945214..0000000000 --- a/.github/workflows/develocity-publish-build-scans.yaml +++ /dev/null @@ -1,42 +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: Develocity - Publish Maven Build Scans - -on: - workflow_run: - workflows: [ "build" ] - types: [ completed ] - -jobs: - - publish-build-scans: - runs-on: ubuntu-latest - permissions: - actions: write - pull-requests: write - steps: - - - name: Setup Build Scan link capture - uses: gradle/develocity-actions/setup-maven@4a2aed82eea165ba2d5c494fc2a8730d7fdff229 # 1.4 - with: - capture-build-scan-links: true - - - name: Publish Build Scans - uses: gradle/develocity-actions/maven-publish-build-scan@4a2aed82eea165ba2d5c494fc2a8730d7fdff229 # 1.4 - with: - develocity-url: 'https://develocity.apache.org' - develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }} diff --git a/.github/workflows/labeler.yaml b/.github/workflows/labeler.yaml deleted file mode 100644 index 141ad42a55..0000000000 --- a/.github/workflows/labeler.yaml +++ /dev/null @@ -1,69 +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: 'Check labels' -on: - issue_comment: - types: [created] - issues: - types: [opened] -env: - issue_user_type: >- - ${{ - contains(fromJSON('["COLLABORATOR","CONTRIBUTOR","MEMBER","OWNER"]'), github.event.issue.author_association) && 'maintainer' || 'user' - }} - comment_user_type: >- - ${{ - github.event_name == 'issue_comment' && - ( - contains(fromJSON('["COLLABORATOR","CONTRIBUTOR","MEMBER","OWNER"]'), github.event.comment.author_association) && 'maintainer' || 'user' - ) || null - }} - -permissions: - issues: write - -jobs: - check-labels: - # Prevents the job from running on pull requests - if: ${{ ! github.event.issue.pull_request }} - runs-on: ubuntu-latest - - steps: - - - name: Print user type - env: - ISSUE_AUTHOR: ${{ github.event.issue.author_association }} - COMMENT_AUTHOR: ${{ github.event.comment.author_association }} - EVENT_NAME: ${{ github.event_name }} - ISSUE_USER_TYPE: ${{ env.issue_user_type }} - COMMENT_USER_TYPE: ${{ env.comment_user_type }} - run: | - echo "Event name:" $EVENT_NAME - echo "Issue created by:" $ISSUE_USER_TYPE - echo "Issue author association:" $ISSUE_AUTHOR - echo "Comment created by:" $COMMENT_USER_TYPE - echo "Comment author association:" $COMMENT_AUTHOR - - # The `waiting-for-maintainer` label needs to match with the one in `close-stale.yaml`! - - name: Add `waiting-for-maintainer` label - if: github.event_name == 'issues' && env.issue_user_type == 'user' || env.comment_user_type == 'user' - env: - ISSUE: ${{ github.event.issue.html_url }} - GH_TOKEN: ${{ github.token }} - run: | - gh issue edit $ISSUE --add-label 'waiting-for-maintainer' --remove-label 'waiting-for-user' diff --git a/.github/workflows/merge-dependabot.yaml b/.github/workflows/merge-dependabot.yaml deleted file mode 100644 index 134d18b1a0..0000000000 --- a/.github/workflows/merge-dependabot.yaml +++ /dev/null @@ -1,52 +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: - - build: - if: github.repository == 'apache/logging-log4j2' && github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]' - uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.1.1 - secrets: - DV_ACCESS_TOKEN: ${{ secrets.DEVELOCITY_ACCESS_KEY }} - with: - java-version: | - 8 - 17 - develocity-enabled: true - reproducibility-check-enabled: false - - merge-dependabot: - needs: build - uses: apache/logging-parent/.github/workflows/merge-dependabot-reusable.yaml@rel/12.1.1 - with: - java-version: 17 - 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 diff --git a/.github/workflows/process-dependabot.yaml b/.github/workflows/process-dependabot.yaml deleted file mode 100644 index d67dfbdebd..0000000000 --- a/.github/workflows/process-dependabot.yaml +++ /dev/null @@ -1,48 +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: "Dependabot Process PR" - -on: - workflow_run: - workflows: - - "Dependabot Analyze PR" - types: - - completed - -# Default permissions for each job. -# Additional permissions should be assigned on a per-job basis. -permissions: { } - -jobs: - - process-dependabot: - # Skip this workflow on commits not pushed by Dependabot - if: ${{ - github.repository == 'apache/logging-log4j2' - && github.actor == 'dependabot[bot]' - && github.event.workflow_run.conclusion == 'success' - }} - uses: apache/logging-parent/.github/workflows/process-dependabot-reusable.yaml@gha/v0 - permissions: - # Append the changelog commit - contents: write - # Convert the PR into draft - pull-requests: write - with: - # The path to the changelog directory for the current development branch. - changelog-path: src/changelog/.2.x.x
