From e6965389d915ce4a1c374351b9c37cdb7f51d5c1 Mon Sep 17 00:00:00 2001 From: Maxim Date: Tue, 21 May 2024 15:57:44 +0300 Subject: [PATCH] Update github actions for updating arlington branch --- .github/workflows/trigger-increment-workflow.yml | 1 + .github/workflows/trigger-regression-tests-workflow.yml | 1 + .github/workflows/update-arlington-workflow.yml | 6 ++++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/trigger-increment-workflow.yml b/.github/workflows/trigger-increment-workflow.yml index 46c7b4a8..6a6f68ab 100644 --- a/.github/workflows/trigger-increment-workflow.yml +++ b/.github/workflows/trigger-increment-workflow.yml @@ -7,6 +7,7 @@ on: jobs: trigger_build: + if: github.repository == 'veraPDF/veraPDF-apps' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/trigger-regression-tests-workflow.yml b/.github/workflows/trigger-regression-tests-workflow.yml index 68787665..749403e4 100644 --- a/.github/workflows/trigger-regression-tests-workflow.yml +++ b/.github/workflows/trigger-regression-tests-workflow.yml @@ -7,6 +7,7 @@ on: jobs: trigger_build: + if: github.repository == 'veraPDF/veraPDF-apps' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/update-arlington-workflow.yml b/.github/workflows/update-arlington-workflow.yml index daa197c7..4c7f4e3b 100644 --- a/.github/workflows/update-arlington-workflow.yml +++ b/.github/workflows/update-arlington-workflow.yml @@ -7,6 +7,7 @@ on: jobs: checkout-and-build: + if: github.repository == 'veraPDF/veraPDF-apps' runs-on: ubuntu-latest strategy: @@ -36,7 +37,7 @@ jobs: git config user.name "Git User" git config user.email "user@test.com" - 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 @@ -62,7 +63,7 @@ jobs: git config user.name "Git User" git config user.email "user@temp.com" - 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: | @@ -78,6 +79,7 @@ jobs: needs: [checkout-and-build, merge] if: | always() && + github.repository == 'veraPDF/veraPDF-apps' && (contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') || contains(needs.*.result, 'cancelled'))