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 }} diff --git a/automated_detection_testing/requirements.txt b/automated_detection_testing/requirements.txt index b10f1657ef..0c8ce7a711 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