diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1de462158c7..7ac0d4a12b6 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -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: @@ -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' diff --git a/pom.xml b/pom.xml index 88bf7db62ff..035ef4574a7 100644 --- a/pom.xml +++ b/pom.xml @@ -306,7 +306,7 @@ - 2.25.0-SNAPSHOT + 2.25.0.pr3105-SNAPSHOT 2.24.1 2.24.1