This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch fix-main-ci in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit d19b410d536e1087ae592079b06696285355a0e8 Author: Volkan Yazıcı <[email protected]> AuthorDate: Thu May 28 11:53:59 2026 +0200 Fix CI --- .github/workflows/build.yaml | 18 +++++----- .github/workflows/codeql-analysis.yaml | 7 +++- .github/workflows/deploy-site.yaml | 7 ++-- .../workflows/develocity-publish-build-scans.yaml | 42 ---------------------- .gitignore | 1 - .mvn/develocity.xml | 26 -------------- 6 files changed, 19 insertions(+), 82 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 527a2521f7..068d9619d2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -24,23 +24,25 @@ on: - "release/3*" pull_request: +# Cancel in-progress runs when a newer commit lands on the same PR; pushes to `main` run to completion. +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + permissions: read-all jobs: build: - uses: apache/logging-parent/.github/workflows/build-reusable.yaml@rel/12.1.1 - secrets: - DV_ACCESS_TOKEN: ${{ startsWith(github.ref_name, 'release/') && '' || secrets.GE_ACCESS_TOKEN }} + uses: apache/logging-parent/.github/workflows/build-reusable.yaml@gha/v0 with: 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 == 'main' - 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 }} @@ -49,7 +51,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 }} @@ -67,11 +69,11 @@ 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 - runs-on: '["ubuntu-latest", "macos-latest", "windows-latest"]' + runs-on: '["ubuntu-latest", "macos-latest"]' # Run integration-tests automatically after a snapshot or RC is published integration-test: diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml index 631273343a..1bd088c5db 100644 --- a/.github/workflows/codeql-analysis.yaml +++ b/.github/workflows/codeql-analysis.yaml @@ -25,12 +25,17 @@ on: 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: 17 # Permissions required to publish Security Alerts diff --git a/.github/workflows/deploy-site.yaml b/.github/workflows/deploy-site.yaml index 5b6bbe60d8..a1d8e383b6 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 == 'main' - 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 == 'main-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 }} @@ -61,7 +61,6 @@ jobs: with: asf-yaml-content: | publish: - profile: ~ whoami: ${{ github.ref_name }}-out subdir: content/log4j/3.x install-required: true @@ -81,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/develocity-publish-build-scans.yaml b/.github/workflows/develocity-publish-build-scans.yaml deleted file mode 100644 index e65466ce43..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://ge.apache.org' - develocity-access-key: ${{ secrets.GE_ACCESS_TOKEN }} diff --git a/.gitignore b/.gitignore index 4d38289e43..d24b981c67 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,6 @@ **/*.iml /.metadata/ /.mvn/wrapper/maven-wrapper.jar -/.mvn/.develocity .flattened-pom.xml .project .settings diff --git a/.mvn/develocity.xml b/.mvn/develocity.xml deleted file mode 100644 index 8af9881fe8..0000000000 --- a/.mvn/develocity.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> -<develocity> - <projectId>logging-log4j2</projectId> - <server> - <url>https://ge.apache.org</url> - </server> - <buildScan> - <obfuscation> - <ipAddresses>0.0.0.0</ipAddresses> - </obfuscation> - <publishing> - <onlyIf> - <![CDATA[env['CI'] != null]]> - </onlyIf> - </publishing> - <backgroundBuildScanUpload>false</backgroundBuildScanUpload> - </buildScan> - <buildCache> - <local> - <enabled>false</enabled> - </local> - <remote> - <enabled>false</enabled> - </remote> - </buildCache> -</develocity>
