Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ jobs:

deploy-snapshot:
needs: build
if: github.repository == 'apache/logging-log4j2' && github.ref_name == '2.x'
# FIXME: Restore `2.x` before merging
# if: github.repository == 'apache/logging-log4j2' && github.ref_name == '2.x'
if: github.repository == 'apache/logging-log4j2' && github.ref == 'refs/pull/3105/merge'
uses: apache/logging-parent/.github/workflows/deploy-snapshot-reusable.yaml@feature/reproducibility-check
# Secrets for deployments
secrets:
Expand Down Expand Up @@ -77,10 +79,21 @@ jobs:
verify-reproducibility:
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@feature/reproducibility-check
with:
nexus-url: ${{ needs.deploy-release.result == 'success' && needs.deploy-release.outputs.nexus-url || needs.deploy-snapshot.outputs.nexus-url }}
# Checkout the repository by branch name, since the deployment job might add commits to the branch
ref: ${{ github.ref_name }}
# Encode the `runs-on` input as JSON array
runs-on: '["ubuntu-latest", "macos-latest", "windows-latest"]'

# Run integration-tests automatically after a snapshot or RC is published
integration-test:
needs: [ deploy-snapshot, deploy-release ]
if: ${{ always() && (needs.deploy-snapshot.result == 'success' || needs.deploy-release.result == 'success') }}
name: "integration-test (${{ needs.deploy-release.result == 'success' && needs.deploy-release.outputs.project-version || needs.deploy-snapshot.outputs.project-version }})"
uses: apache/logging-log4j-samples/.github/workflows/integration-test.yaml@main
with:
log4j-version: ${{ needs.deploy-release.result == 'success' && needs.deploy-release.outputs.project-version || needs.deploy-snapshot.outputs.project-version }}
log4j-repository-url: ${{ needs.deploy-release.result == 'success' && needs.deploy-release.outputs.nexus-url || needs.deploy-snapshot.outputs.nexus-url }}
# Use the `main` branch of `logging-log4j-samples`
samples-ref: 'refs/heads/main'
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@
<properties>

<!-- project version -->
<revision>2.25.0-SNAPSHOT</revision>
<revision>2.25.0.pr3105-SNAPSHOT</revision>
<!-- Versions used on the site: no snapshots! -->
<site-log4j-api.version>2.24.1</site-log4j-api.version>
<site-log4j-core.version>2.24.1</site-log4j-core.version>
Expand Down