This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
The following commit(s) were added to refs/heads/main by this push:
new f59424d Allow to specify the version of `logging-log4j-samples` to use
f59424d is described below
commit f59424d0c6969c49929231c2b4b6f68d07789b09
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Thu Oct 17 12:57:57 2024 +0200
Allow to specify the version of `logging-log4j-samples` to use
---
.github/workflows/android-reusable-test.yaml | 7 +++++++
.github/workflows/graalvm-reusable-test.yaml | 7 +++++++
.github/workflows/integration-test.yaml | 12 +++++++++++-
.github/workflows/merge-dependabot.yaml | 3 +++
4 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/android-reusable-test.yaml
b/.github/workflows/android-reusable-test.yaml
index a6df28e..1e12205 100644
--- a/.github/workflows/android-reusable-test.yaml
+++ b/.github/workflows/android-reusable-test.yaml
@@ -29,6 +29,10 @@ on:
description: Additional Maven repository
type: string
default: 'https://repository.apache.org/snapshots'
+ samples-ref:
+ description: The branch, tag or SHA of `logging-log4j-samples` to
checkout
+ type: string
+ default: ${{ github.ref }}
permissions: read-all
@@ -42,6 +46,9 @@ jobs:
- name: Checkout repository
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #
4.2.1
+ with:
+ repository: 'apache/logging-log4j-samples'
+ ref: ${{ inputs.samples-ref }}
- name: Setup Java
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 #
4.4.0
diff --git a/.github/workflows/graalvm-reusable-test.yaml
b/.github/workflows/graalvm-reusable-test.yaml
index 0ff5ae9..eb07b6d 100644
--- a/.github/workflows/graalvm-reusable-test.yaml
+++ b/.github/workflows/graalvm-reusable-test.yaml
@@ -29,6 +29,10 @@ on:
description: Additional Maven repository
type: string
default: 'https://repository.apache.org/snapshots'
+ samples-ref:
+ description: The branch, tag or SHA of `logging-log4j-samples` to
checkout
+ type: string
+ default: ${{ github.ref }}
permissions: read-all
@@ -47,6 +51,9 @@ jobs:
- name: Checkout repository
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #
4.2.1
+ with:
+ repository: 'apache/logging-log4j-samples'
+ ref: ${{ inputs.samples-ref }}
- name: Setup GraalVM
uses: graalvm/setup-graalvm@6f327093bb6a42fe5eac053d21b168c46aa46f22
# 1.2.4
diff --git a/.github/workflows/integration-test.yaml
b/.github/workflows/integration-test.yaml
index 797efc4..ce3c85e 100644
--- a/.github/workflows/integration-test.yaml
+++ b/.github/workflows/integration-test.yaml
@@ -29,6 +29,10 @@ on:
description: Additional Maven repository
type: string
default: 'https://repository.apache.org/snapshots'
+ samples-ref:
+ description: The branch, tag or SHA of `logging-log4j-samples` to
checkout
+ type: string
+ default: ${{ github.ref }}
workflow_dispatch:
inputs:
log4j-version:
@@ -38,6 +42,10 @@ on:
log4j-repository-url:
description: Additional Maven repository
default: 'https://repository.apache.org/snapshots'
+ samples-ref:
+ description: The branch, tag or SHA of `logging-log4j-samples` to
checkout
+ type: string
+ default: 'refs/heads/main'
env:
MAVEN_ARGS: ${{ inputs.log4j-version }}
@@ -47,12 +55,14 @@ permissions: read-all
jobs:
jre-test:
- uses: apache/logging-parent/.github/workflows/build-reusable.yaml@main
+ uses:
apache/logging-parent/.github/workflows/build-reusable.yaml@feature/reproducibility-check
with:
java-version: 21
maven-args: |
-Dlog4j.version=${{ inputs.log4j-version }}
-Dlog4j.repository.url=${{ inputs.log4j-repository-url }}
+ repository: 'apache/logging-log4j-samples'
+ ref: ${{ inputs.samples-ref }}
android-test:
uses:
apache/logging-log4j-samples/.github/workflows/android-reusable-test.yaml@main
diff --git a/.github/workflows/merge-dependabot.yaml
b/.github/workflows/merge-dependabot.yaml
index c85ac88..27ec773 100644
--- a/.github/workflows/merge-dependabot.yaml
+++ b/.github/workflows/merge-dependabot.yaml
@@ -31,6 +31,9 @@ jobs:
integration-test:
if: github.repository == 'apache/logging-log4j-samples' &&
github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
uses:
apache/logging-log4j-samples/.github/workflows/integration-test.yaml@main
+ with:
+ # When running on `pull_request_target` use the PR branch, not the
target branch
+ samples-ref: ${{ github.head_ref }}
merge-dependabot:
needs: integration-test
