Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:HeliumEdu/platform into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
alexdlaird committed May 26, 2024
2 parents 98a48bb + f270d3e commit 4920949
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 20 deletions.
28 changes: 28 additions & 0 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Auto-Merge Dependabot PRs

on:
pull_request:

jobs:
automerge:
name: Auto-Merge Dependabot PRs

runs-on: ubuntu-latest

permissions:
pull-requests: write
contents: write

if: github.actor == 'dependabot[bot]'
steps:
- name: Get Dependabot metadata
uses: dependabot/fetch-metadata@v2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: Enable auto-merge
run: |
gh pr review --approve "$PR_URL"
gh pr merge --squash --auto "$PR_URL"
env:
PR_URL: ${{ github.event.pull_request.html_url }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
17 changes: 1 addition & 16 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,4 @@ jobs:
if: matrix.python-version == '3.11'
uses: codecov/codecov-action@v3
with:
directory: ./build/coverage

automerge:
name: "Auto Approve"
needs: build
runs-on: ubuntu-latest

permissions:
pull-requests: write
contents: write

steps:
- uses: fastify/github-action-merge-dependabot@v3
with:
target: major
use-github-auto-merge: true
directory: ./build/coverage
4 changes: 2 additions & 2 deletions requirements-deploy.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
django-storages==1.14.2
boto3==1.34.76
django-storages==1.14.3
boto3==1.34.107
mysqlclient==2.2.4
django-redis==5.4.0
rollbar==1.0.0
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ django-debug-toolbar==4.3.0
djangorestframework==3.14.0
django-filter==24.2
django-maintenance-mode==0.21.1
django-pipeline==3.0.0
django-pipeline==3.1.0
django-cors-headers==4.3.1
coreapi==2.3.3
celery[redis]==5.4.0
statsd==4.0.1
datadog==0.49.1
twilio==9.0.3
twilio==9.0.5
pyOpenSSL==24.1.0
Pillow==10.3.0
icalendar==5.0.12
Expand Down

0 comments on commit 4920949

Please sign in to comment.