From faa0e97e41cee169fd2f22de756bdda26465a2d3 Mon Sep 17 00:00:00 2001 From: jasquat Date: Fri, 10 Jun 2022 09:41:17 -0400 Subject: [PATCH 1/2] updated README to get change w/ burnettk --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 451dc79..14ec8de 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ This is the frontend part of an app that leverages [spiffworkflow](https://github.com/sartography/spiffworkflow). -This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app), eh. +This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). ## Available Scripts From 34c4fdd539f97a6499e44b22e3d542bd35e351d6 Mon Sep 17 00:00:00 2001 From: jasquat Date: Fri, 10 Jun 2022 09:56:02 -0400 Subject: [PATCH 2/2] checkout the repo before auto merging w/ burnettk --- .github/workflows/auto-merge-dependabot-prs.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/auto-merge-dependabot-prs.yml b/.github/workflows/auto-merge-dependabot-prs.yml index b5273bc..57a12c9 100644 --- a/.github/workflows/auto-merge-dependabot-prs.yml +++ b/.github/workflows/auto-merge-dependabot-prs.yml @@ -33,6 +33,8 @@ jobs: # FIXME: uncomment after logging confirms actor is dependabot # if: ${{ github.actor == 'dependabot[bot]' && github.event.workflow_run.conclusion == 'success' }} steps: + - name: Development Code + uses: actions/checkout@v3 - name: Log github metadata for debugging # if: ${{contains(steps.metadata.outputs.dependency-names, 'pytest') && steps.metadata.outputs.update-type == 'version-update:semver-patch'}} # if: ${{contains(steps.metadata.outputs.dependency-names, 'pytest')}} @@ -49,6 +51,7 @@ jobs: PR_URL: ${{github.event.pull_request.html_url}} GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + ###### GET PR NUMBER # we saved the pr_number in tests.yml. fetch it so we can merge the correct PR. # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_run - name: 'Download artifact' @@ -80,7 +83,10 @@ jobs: # uses: dependabot/fetch-metadata@v1.3.1 # with: # github-token: "${{ secrets.GITHUB_TOKEN }}" + ########### + - name: print pr number + run: cat pr_number - name: actually merge it # if: ${{contains(steps.metadata.outputs.dependency-names, 'pytest') && steps.metadata.outputs.update-type == 'version-update:semver-patch'}} # if: ${{contains(steps.metadata.outputs.dependency-names, 'pytest')}}