Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MINOR Add a step to integrate a PR into trunk #17316

Closed
wants to merge 6 commits into from
Closed

MINOR Add a step to integrate a PR into trunk #17316

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9434435
Add a step to integrate the PR into trunk
mumrah Sep 30, 2024
189fb00
fix variable
mumrah Sep 30, 2024
46330a0
fetch trunk
mumrah Sep 30, 2024
8110d69
specify origin
mumrah Sep 30, 2024
6b83d58
increase fetch depth
mumrah Sep 30, 2024
35495d9
just merge trunk into the PR branch
mumrah Sep 30, 2024
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
26 changes: 26 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,32 @@ jobs:
env:
GITHUB_WORKSPACE: ${{ github.workspace }}

integrate:
if: inputs.is-public-fork
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
java: [ 21, 17, 11, 8 ]
name: Integrate with trunk, compile, and check Java ${{ matrix.java }}
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
persist-credentials: false
- name: Setup Gradle
uses: ./.github/actions/setup-gradle
with:
java-version: ${{ matrix.java }}
gradle-cache-read-only: true
gradle-cache-write-only: false
develocity-access-key: ${{ secrets.GE_ACCESS_TOKEN }}
- name: Merge, Compile, and validate
run: |
git fetch origin trunk
git merge origin/trunk
./gradlew --build-cache --info --no-scan check -x test

test:
needs: validate
if: ${{ ! needs.validate.outputs.is-draft }}
Expand Down
Loading