From 36f18aa2cae6c0db34b2df81846328ea84ddde22 Mon Sep 17 00:00:00 2001 From: divious1 Date: Mon, 2 Nov 2020 21:19:19 -0500 Subject: [PATCH 1/2] adding dependabot automerge with git workflows --- .github/workflows/auto-merge.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/workflows/auto-merge.yml diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml new file mode 100644 index 0000000000..b137d2f450 --- /dev/null +++ b/.github/workflows/auto-merge.yml @@ -0,0 +1,12 @@ +name: auto-merge + +on: + pull_request: + +jobs: + auto-merge: + runs-on: ubuntu-latest + steps: + - uses: ahmadnassri/action-dependabot-auto-merge@v2 + with: + github-token: ${{ secrets.auto-merge }} From 193fc587be7bb1af7acbd6ced5307eb6f4cc420c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Nov 2020 08:40:41 +0000 Subject: [PATCH 2/2] Bump boto3 from 1.16.6 to 1.16.10 Bumps [boto3](https://github.com/boto/boto3) from 1.16.6 to 1.16.10. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.16.6...1.16.10) Signed-off-by: dependabot[bot] --- automated_detection_testing/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated_detection_testing/requirements.txt b/automated_detection_testing/requirements.txt index 6e2a8251c6..d84764e612 100644 --- a/automated_detection_testing/requirements.txt +++ b/automated_detection_testing/requirements.txt @@ -6,7 +6,7 @@ atomicwrites==1.4.0 attackcti==0.3.3 attrs==19.3.0 bcrypt==3.2.0 -boto3==1.16.6 +boto3==1.16.10 botocore==1.19.10 certifi==2019.11.28 cffi==1.14.3