From 60c62868803d1267bf833cb3d05485e2cbb825d0 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Fri, 5 Feb 2021 14:06:19 -0500 Subject: [PATCH 1/7] Workflow to dump foo.txt Does GH run tests with master merged? --- .github/workflows/A.yml | 13 ----------- .github/workflows/B.yml | 13 ----------- .github/workflows/cancel-dups.yml | 39 ------------------------------- .github/workflows/dump.yml | 10 ++++++++ 4 files changed, 10 insertions(+), 65 deletions(-) delete mode 100644 .github/workflows/A.yml delete mode 100644 .github/workflows/B.yml delete mode 100644 .github/workflows/cancel-dups.yml create mode 100644 .github/workflows/dump.yml diff --git a/.github/workflows/A.yml b/.github/workflows/A.yml deleted file mode 100644 index 5cec005..0000000 --- a/.github/workflows/A.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: Workflow A -on: push - -jobs: - sleep: - runs-on: ubuntu-latest - steps: - - name: Before - run: echo "..." - - name: Sleep - run: sleep 60 - - name: After - run: echo "done" diff --git a/.github/workflows/B.yml b/.github/workflows/B.yml deleted file mode 100644 index 1feda77..0000000 --- a/.github/workflows/B.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: Workflow B -on: push - -jobs: - sleep: - runs-on: ubuntu-latest - steps: - - name: Before - run: echo "..." - - name: Sleep - run: sleep 60 - - name: After - run: echo "done" diff --git a/.github/workflows/cancel-dups.yml b/.github/workflows/cancel-dups.yml deleted file mode 100644 index 555ccb6..0000000 --- a/.github/workflows/cancel-dups.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Cancelling -on: - workflow_run: - workflows: - - Workflow A - - Workflow B - types: [ 'requested' ] - -jobs: - cancel-dups: - name: Cancel duplicate workflow runs - runs-on: ubuntu-latest - if: github.event.workflow_run.name != 'Workflow B' - - steps: - - uses: potiuk/cancel-workflow-runs@master - name: "Cancel duplicate workflow runs" - with: - token: ${{ secrets.GITHUB_TOKEN }} - cancelMode: duplicates - sourceRunId: ${{ github.event.workflow_run.id }} - - cancel-builds: - name: Cancel duplicate builds - runs-on: ubuntu-latest - - # Keep the branch part of this condition in sync with the corresponding condition in build.yml - if: > - github.event.workflow_run.name == 'Workflow B' && ! ( - github.event.workflow_run.head_branch == '🙄' - ) - - steps: - - uses: potiuk/cancel-workflow-runs@master - name: "Cancel duplicate builds" - with: - token: ${{ secrets.GITHUB_TOKEN }} - cancelMode: duplicates - sourceRunId: ${{ github.event.workflow_run.id }} diff --git a/.github/workflows/dump.yml b/.github/workflows/dump.yml new file mode 100644 index 0000000..9a5db1b --- /dev/null +++ b/.github/workflows/dump.yml @@ -0,0 +1,10 @@ +name: Dump +on: pull_request + +jobs: + dump: + name: Dump foo.txt + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: cat foo.txt From c26a11ff71962e0e160482b50876aaba533bd71b Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Fri, 5 Feb 2021 14:08:43 -0500 Subject: [PATCH 2/7] Logging --- .github/workflows/dump.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/dump.yml b/.github/workflows/dump.yml index 9a5db1b..bcbade8 100644 --- a/.github/workflows/dump.yml +++ b/.github/workflows/dump.yml @@ -8,3 +8,5 @@ jobs: steps: - uses: actions/checkout@v2 - run: cat foo.txt + - run: git branch -a + - run: git log From 36b76796ab2168d50bb02881fa1f462baf3ecfea Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Fri, 5 Feb 2021 14:28:54 -0500 Subject: [PATCH 3/7] Try manually merging --- .github/workflows/dump.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/dump.yml b/.github/workflows/dump.yml index bcbade8..35f56a6 100644 --- a/.github/workflows/dump.yml +++ b/.github/workflows/dump.yml @@ -7,6 +7,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - run: | + git fetch origin "$GITHUB_BASE_REF" + git merge FETCH_HEAD - run: cat foo.txt - run: git branch -a - run: git log From c31e1a5d32302a16233faaaf58b4b489a34fdabe Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Fri, 5 Feb 2021 14:30:28 -0500 Subject: [PATCH 4/7] Fetch depth --- .github/workflows/dump.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/dump.yml b/.github/workflows/dump.yml index 35f56a6..a02aa3c 100644 --- a/.github/workflows/dump.yml +++ b/.github/workflows/dump.yml @@ -7,6 +7,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + with: + fetch-depth: 0 - run: | git fetch origin "$GITHUB_BASE_REF" git merge FETCH_HEAD From 24099ee922a1ee7382aaac79c08bd4dfa9ef7b70 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Fri, 5 Feb 2021 14:33:33 -0500 Subject: [PATCH 5/7] Creds for merge commit --- .github/workflows/dump.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/dump.yml b/.github/workflows/dump.yml index a02aa3c..e009966 100644 --- a/.github/workflows/dump.yml +++ b/.github/workflows/dump.yml @@ -11,6 +11,8 @@ jobs: fetch-depth: 0 - run: | git fetch origin "$GITHUB_BASE_REF" + git config --global user.name "$GITHUB_ACTOR" + git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com" git merge FETCH_HEAD - run: cat foo.txt - run: git branch -a From fbf376d4b5ece2d0319670a2fe1c3cb1e4b5ad88 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Tue, 23 Mar 2021 16:34:35 -0400 Subject: [PATCH 6/7] Increment foo --- foo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foo.txt b/foo.txt index 00750ed..b8626c4 100644 --- a/foo.txt +++ b/foo.txt @@ -1 +1 @@ -3 +4 From fb939e5b2caf3377f3059ec66765b0af47b717c3 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Tue, 23 Mar 2021 16:41:01 -0400 Subject: [PATCH 7/7] Increment foo --- foo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foo.txt b/foo.txt index b8626c4..7ed6ff8 100644 --- a/foo.txt +++ b/foo.txt @@ -1 +1 @@ -4 +5