Skip to content

Commit

Permalink
Update github actions for updating jakarta and arlington branches
Browse files Browse the repository at this point in the history
  • Loading branch information
MaximPlusov committed May 21, 2024
1 parent 1c6780d commit 064cc17
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/update-arlington-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:

jobs:
checkout-and-build:
if: github.repository == 'veraPDF/veraPDF-integration-tests'
runs-on: ubuntu-latest

strategy:
Expand All @@ -31,12 +32,12 @@ jobs:
run: |
git fetch origin arlington:arlington
git checkout -b test-branch arlington
- name: Configure user nameF
- name: Configure user name
run: |
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.sha }}
run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }}
- name: Build project with Maven
if: success()
run: mvn --batch-mode --update-snapshots verify
Expand All @@ -62,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.sha }}
run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }}
- name: Merge branch into arlington
if: success()
run: |
Expand All @@ -78,6 +79,7 @@ jobs:
needs: [checkout-and-build, merge]
if: |
always() &&
github.repository == 'veraPDF/veraPDF-integration-tests' &&
(contains(needs.*.result, 'failure') ||
contains(needs.*.result, 'skipped') ||
contains(needs.*.result, 'cancelled'))
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/update-jakarta-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:

jobs:
checkout-and-build:
if: github.repository == 'veraPDF/veraPDF-integration-tests'
runs-on: ubuntu-latest

strategy:
Expand Down Expand Up @@ -36,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.sha }}
run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }}
- name: Build project with Maven
if: success()
run: mvn --batch-mode --update-snapshots verify
Expand All @@ -62,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.sha }}
run: git cherry-pick -m 1 ${{ github.event.before }}..${{ github.event.after }}
- name: Merge branch into jakarta
if: success()
run: |
Expand All @@ -78,6 +79,7 @@ jobs:
needs: [checkout-and-build, merge]
if: |
always() &&
github.repository == 'veraPDF/veraPDF-integration-tests' &&
(contains(needs.*.result, 'failure') ||
contains(needs.*.result, 'skipped') ||
contains(needs.*.result, 'cancelled'))
Expand Down

0 comments on commit 064cc17

Please sign in to comment.