From 354ec2bb3dc32341b0c7d096cc4312f69d4ddb10 Mon Sep 17 00:00:00 2001 From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com> Date: Wed, 27 Sep 2023 11:47:55 -0400 Subject: [PATCH 1/3] ci(dependabot): Auto-approve and enable automerge for dependabot PRs --- .github/workflows/dependabot.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/dependabot.yml diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml new file mode 100644 index 000000000..3c0cfb8d8 --- /dev/null +++ b/.github/workflows/dependabot.yml @@ -0,0 +1,20 @@ + +name: Auto-approve and enable auto-merge on dependabot PRs +on: pull_request_target + +jobs: + auto-approve-and-automerge: + # sources: + # https://github.com/hmarr/auto-approve-action + # https://github.com/marketplace/actions/enable-pull-request-automerge#dependabot-example + runs-on: ubuntu-latest + permissions: + pull-requests: write + if: github.actor == 'dependabot[bot]' + steps: + - name: Auto-approve PR + uses: hmarr/auto-approve-action@v3 + - name: Enable auto-merge + run: gh pr merge --merge --auto "1" + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 5cf3397fe50c99fda86f789c6b2777a32e7fa552 Mon Sep 17 00:00:00 2001 From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com> Date: Wed, 27 Sep 2023 12:23:40 -0400 Subject: [PATCH 2/3] ci(dependabot): Include PR number in auto-merge command --- .github/workflows/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml index 3c0cfb8d8..f9da5d0b0 100644 --- a/.github/workflows/dependabot.yml +++ b/.github/workflows/dependabot.yml @@ -15,6 +15,6 @@ jobs: - name: Auto-approve PR uses: hmarr/auto-approve-action@v3 - name: Enable auto-merge - run: gh pr merge --merge --auto "1" + run: gh pr merge --merge --auto ${{ github.event.pull_request.number }} env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} From e6d2f639b17120c0fbbb0d555aadc11a5b2519c6 Mon Sep 17 00:00:00 2001 From: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com> Date: Mon, 2 Oct 2023 19:49:03 -0400 Subject: [PATCH 3/3] docs: Fix typos --- lib/components/viewers/next-arrival-for-pattern.tsx | 2 +- lib/util/viewer.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/components/viewers/next-arrival-for-pattern.tsx b/lib/components/viewers/next-arrival-for-pattern.tsx index 2fceb4cf8..bed35582c 100644 --- a/lib/components/viewers/next-arrival-for-pattern.tsx +++ b/lib/components/viewers/next-arrival-for-pattern.tsx @@ -21,7 +21,7 @@ type Props = { pattern: Pattern // Not the true operator type, but the one that's used here // It is annoying to shoehorn the operator in here like this, but passing - // it in indvidually would cause a situation where a list of routes + // it in individually would cause a situation where a list of routes // needs to be matched up with a list of operators route: Route & { operator?: { colorMode?: string } } routeColor: string diff --git a/lib/util/viewer.js b/lib/util/viewer.js index bdb27b3cb..9f1f9ef9d 100644 --- a/lib/util/viewer.js +++ b/lib/util/viewer.js @@ -40,7 +40,7 @@ function excludeLastStop(stopTime) { * Checks that the given route object from an OTP pattern is valid. * If it is not, logs a warning message. * - * FIXME: there is currently a bug with the alernative transit index + * FIXME: there is currently a bug with the alternative transit index * where routes are not associated with the stop if the only stoptimes * for the stop are drop off only. See https://github.com/ibi-group/trimet-mod-otp/issues/217 *