This is an automated email from the ASF dual-hosted git repository.
ramanathan1504 pushed a commit to branch 2.25.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.25.x by this push:
new b3257bcbd4 Sync GitHub Actions workflows with 2.x to fix CI startup
b3257bcbd4 is described below
commit b3257bcbd43491eb6db3f4c0dfb8abc0f2c6ca40
Author: Ramanathan <[email protected]>
AuthorDate: Wed Jul 1 12:38:38 2026 +0530
Sync GitHub Actions workflows with 2.x to fix CI startup
---
...odeql-analysis.yaml => analyze-dependabot.yaml} | 31 +++++++---------
.github/workflows/build.yaml | 24 ++++++++-----
.github/workflows/close-stale.yaml | 2 +-
.github/workflows/codeql-analysis.yaml | 14 +++++++-
.github/workflows/deploy-site.yaml | 6 ++--
...odeql-analysis.yaml => process-dependabot.yaml} | 42 ++++++++++++----------
6 files changed, 70 insertions(+), 49 deletions(-)
diff --git a/.github/workflows/codeql-analysis.yaml
b/.github/workflows/analyze-dependabot.yaml
similarity index 57%
copy from .github/workflows/codeql-analysis.yaml
copy to .github/workflows/analyze-dependabot.yaml
index 6609a93e77..cd991d3637 100644
--- a/.github/workflows/codeql-analysis.yaml
+++ b/.github/workflows/analyze-dependabot.yaml
@@ -15,28 +15,23 @@
# limitations under the License.
#
-name: codeql-analysis
+name: "Dependabot Analyze PR"
on:
- push:
- branches: [ "2.x", "main" ]
pull_request:
- branches: [ "2.x", "main" ]
- schedule:
- - cron: '32 12 * * 5'
-permissions: read-all
+# Default permissions for each job.
+# Additional permissions should be assigned on a per-job basis.
+permissions: { }
jobs:
- analyze:
- uses:
apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/12.1.1
- with:
- java-version: |
- 8
- 17
- # Permissions required to publish Security Alerts
- permissions:
- actions: read
- contents: read
- security-events: write
+ analyze-dependabot:
+ # `github.actor` prevents recursive calls when `github-actions[bot]`
pushes to the PR;
+ # `github.event.pull_request.user.login` skips PRs not opened by
Dependabot.
+ if: ${{
+ github.repository == 'apache/logging-log4j2'
+ && github.actor == 'dependabot[bot]'
+ && github.event.pull_request.user.login == 'dependabot[bot]'
+ }}
+ uses:
apache/logging-parent/.github/workflows/analyze-dependabot-reusable.yaml@gha/v0
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 271d757dda..9566bbb255 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -24,28 +24,36 @@ on:
- "2.25.x"
- "release/2*"
pull_request:
+ types:
+ # Standard types
+ - opened
+ - synchronize
+ - reopened
+ # Used in Dependabot PRs to retrigger required workflows
+ - ready_for_review
+
+# Cancel in-progress runs when a newer commit lands on the same PR; pushes to
2.x run to completion.
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: ${{ github.event_name == 'pull_request' }}
permissions: read-all
jobs:
build:
- if: github.actor != 'dependabot[bot]'
- uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.1.1
- secrets:
- DV_ACCESS_TOKEN: ${{ startsWith(github.ref_name, 'release/') && '' ||
secrets.DEVELOCITY_ACCESS_KEY }}
+ uses: apache/logging-parent/.github/workflows/build-reusable.yaml@gha/v0
with:
java-version: |
8
17
site-enabled: true
reproducibility-check-enabled: false
- develocity-enabled: ${{ ! startsWith(github.ref_name, 'release/') }}
deploy-snapshot:
needs: build
if: github.repository == 'apache/logging-log4j2' && github.ref_name ==
'2.x'
- uses:
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@rel/12.1.1
+ uses:
apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@gha/v0
# Secrets for deployments
secrets:
NEXUS_USERNAME: ${{ secrets.NEXUS_USER }}
@@ -58,7 +66,7 @@ jobs:
deploy-release:
needs: build
if: github.repository == 'apache/logging-log4j2' &&
startsWith(github.ref_name, 'release/')
- uses:
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/12.1.1
+ uses:
apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@gha/v0
# Secrets for deployments
secrets:
GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
@@ -79,7 +87,7 @@ jobs:
needs: [ deploy-snapshot, deploy-release ]
if: ${{ always() && (needs.deploy-snapshot.result == 'success' ||
needs.deploy-release.result == 'success') }}
name: "verify-reproducibility (${{ needs.deploy-release.result ==
'success' && needs.deploy-release.outputs.project-version ||
needs.deploy-snapshot.outputs.project-version }})"
- uses:
apache/logging-parent/.github/workflows/verify-reproducibility-reusable.yaml@rel/12.1.1
+ uses:
apache/logging-parent/.github/workflows/verify-reproducibility-reusable.yaml@gha/v0
with:
nexus-url: ${{ needs.deploy-release.result == 'success' &&
needs.deploy-release.outputs.nexus-url ||
'https://repository.apache.org/content/groups/snapshots' }}
# Encode the `runs-on` input as JSON array
diff --git a/.github/workflows/close-stale.yaml
b/.github/workflows/close-stale.yaml
index 5978d1aac5..50870630b7 100644
--- a/.github/workflows/close-stale.yaml
+++ b/.github/workflows/close-stale.yaml
@@ -28,7 +28,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 #
v9.1.0
+ - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f #
v10.2.0
with:
# Labels need to match with the ones in `labeler.yaml`!
only-labels: waiting-for-user
diff --git a/.github/workflows/codeql-analysis.yaml
b/.github/workflows/codeql-analysis.yaml
index 6609a93e77..cf59560a10 100644
--- a/.github/workflows/codeql-analysis.yaml
+++ b/.github/workflows/codeql-analysis.yaml
@@ -22,15 +22,27 @@ on:
branches: [ "2.x", "main" ]
pull_request:
branches: [ "2.x", "main" ]
+ types:
+ # Standard types
+ - opened
+ - synchronize
+ - reopened
+ # Used in Dependabot PRs to retrigger required workflows
+ - ready_for_review
schedule:
- cron: '32 12 * * 5'
+# Cancel in-progress runs when a newer commit lands on the same PR; pushes to
2.x run to completion.
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
permissions: read-all
jobs:
analyze:
- uses:
apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/12.1.1
+ uses:
apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@gha/v0
with:
java-version: |
8
diff --git a/.github/workflows/deploy-site.yaml
b/.github/workflows/deploy-site.yaml
index e65aab28ca..59aba57c8f 100644
--- a/.github/workflows/deploy-site.yaml
+++ b/.github/workflows/deploy-site.yaml
@@ -33,7 +33,7 @@ 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@rel/12.1.1
+ 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 }}
@@ -51,7 +51,7 @@ jobs:
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@rel/12.1.1
+ 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 }}
@@ -80,7 +80,7 @@ jobs:
deploy-site-rel:
needs: export-version
- uses:
apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/12.1.1
+ 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 }}
diff --git a/.github/workflows/codeql-analysis.yaml
b/.github/workflows/process-dependabot.yaml
similarity index 50%
copy from .github/workflows/codeql-analysis.yaml
copy to .github/workflows/process-dependabot.yaml
index 6609a93e77..d67dfbdebd 100644
--- a/.github/workflows/codeql-analysis.yaml
+++ b/.github/workflows/process-dependabot.yaml
@@ -15,28 +15,34 @@
# limitations under the License.
#
-name: codeql-analysis
+name: "Dependabot Process PR"
on:
- push:
- branches: [ "2.x", "main" ]
- pull_request:
- branches: [ "2.x", "main" ]
- schedule:
- - cron: '32 12 * * 5'
+ workflow_run:
+ workflows:
+ - "Dependabot Analyze PR"
+ types:
+ - completed
-permissions: read-all
+# Default permissions for each job.
+# Additional permissions should be assigned on a per-job basis.
+permissions: { }
jobs:
- analyze:
- uses:
apache/logging-parent/.github/workflows/codeql-analysis-reusable.yaml@rel/12.1.1
- with:
- java-version: |
- 8
- 17
- # Permissions required to publish Security Alerts
+ 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:
- actions: read
- contents: read
- security-events: write
+ # 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
