From 6497fec8a7a9d2b326b80340e23242a75d30e3fb Mon Sep 17 00:00:00 2001 From: Alex Viquez Date: Tue, 8 Feb 2022 09:59:06 -0600 Subject: [PATCH 1/2] auto-test (#220) * auto-test * fix auto-merge * auto-test --- .github/workflows/auto_merge.yml | 12 +++++++----- cuenca/resources/__init__.py | 1 - 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/auto_merge.yml b/.github/workflows/auto_merge.yml index dfcabc3d..00968c40 100644 --- a/.github/workflows/auto_merge.yml +++ b/.github/workflows/auto_merge.yml @@ -1,13 +1,15 @@ -name: auto-merge +name: 'Merge Dependencies' -on: - pull_request: +on: [pull_request_target] jobs: auto-merge: runs-on: ubuntu-latest + if: github.actor == 'dependabot[bot]' steps: - - uses: actions/checkout@v2 - - uses: ahmadnassri/action-dependabot-auto-merge@v2 + - name: 'Checkout repository' + uses: actions/checkout@v2.3.4 + - name: 'Automerge dependency updates from Dependabot' + uses: ahmadnassri/action-dependabot-auto-merge@v2.4.0 with: github-token: ${{ secrets.DEPENDABOT_AUTOMERGE }} diff --git a/cuenca/resources/__init__.py b/cuenca/resources/__init__.py index 1f4fb481..e2bf6ca2 100644 --- a/cuenca/resources/__init__.py +++ b/cuenca/resources/__init__.py @@ -19,7 +19,6 @@ 'WalletTransaction', 'WhatsappTransfer', ] - from .accounts import Account from .api_keys import ApiKey from .arpc import Arpc From a78ffb5f647556636ebb8ab272f26f95a82c7069 Mon Sep 17 00:00:00 2001 From: AlexViquez Date: Tue, 8 Feb 2022 10:13:51 -0600 Subject: [PATCH 2/2] space --- cuenca/resources/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cuenca/resources/__init__.py b/cuenca/resources/__init__.py index e2bf6ca2..1f4fb481 100644 --- a/cuenca/resources/__init__.py +++ b/cuenca/resources/__init__.py @@ -19,6 +19,7 @@ 'WalletTransaction', 'WhatsappTransfer', ] + from .accounts import Account from .api_keys import ApiKey from .arpc import Arpc