-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix github actions for updating arlington and jakarta branches
- Loading branch information
1 parent
54edbfd
commit 437cb12
Showing
2 changed files
with
4 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -53,7 +53,7 @@ jobs: | |
| git config user.name "Git User" | ||
| git config user.email "[email protected]" | ||
| - name: Add commit to the test branch | ||
| run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} | ||
| run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} --empty=drop | ||
| - name: Build project with Maven | ||
| if: success() | ||
| run: mvn --batch-mode --update-snapshots verify | ||
|
|
@@ -79,7 +79,7 @@ jobs: | |
| git config user.name "Git User" | ||
| git config user.email "[email protected]" | ||
| - name: Add commit to new branch | ||
| run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} | ||
| run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} --empty=drop | ||
| - name: Merge branch into arlington | ||
| if: success() | ||
| run: | | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,7 +37,7 @@ jobs: | |
| git config user.name "Git User" | ||
| git config user.email "[email protected]" | ||
| - name: Add commit to the test branch | ||
| run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} | ||
| run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} --empty=drop | ||
| - name: Build project with Maven | ||
| if: success() | ||
| run: mvn --batch-mode --update-snapshots verify | ||
|
|
@@ -63,7 +63,7 @@ jobs: | |
| git config user.name "Git User" | ||
| git config user.email "[email protected]" | ||
| - name: Add commit to new branch | ||
| run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} | ||
| run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }} --empty=drop | ||
| - name: Merge branch into jakarta | ||
| if: success() | ||
| run: | | ||
|
|
||