Skip to content

Commit

Permalink
changed dependabot auto-merge and removed vercel
Browse files Browse the repository at this point in the history
  • Loading branch information
saifbechan committed Mar 16, 2021
1 parent 331d5a0 commit cd91b28
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 30 deletions.
5 changes: 0 additions & 5 deletions .github/auto-merge.yml

This file was deleted.

14 changes: 8 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "daily"
rebase-strategy: "auto"
labels:
- "security"
- "dependencies"
14 changes: 6 additions & 8 deletions .github/workflows/main-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,21 @@ name: saifbechan.github.io CD

on:
push:
branches: [ main ]
branches: [main]

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14, 15]
worker:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2
with:
persist-credentials: false

- name: Unit tests & Linters (Node ${{ matrix.node-version }})
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
node-version: 15
- run: |
yarn
yarn tsc
Expand Down
30 changes: 20 additions & 10 deletions .github/workflows/main-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,21 @@ name: saifbechan.github.io CI

on:
pull_request:
branches: [ main ]
branches: [main]

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14, 15]
worker:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v2
with:
persist-credentials: false

- name: Unit tests & Linters (Node ${{ matrix.node-version }})
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
node-version: 15
- run: |
yarn
yarn tsc
Expand All @@ -38,8 +36,20 @@ jobs:
start: yarn start:test
wait-on: http://localhost:3030

- name: Dependabot auto-approve
uses: hmarr/auto-approve-action@v2.0.0
- name: Auto merge
uses: actions/github-script@0.2.0
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
with:
script: |
github.pullRequests.createReview({
owner: context.payload.repository.owner.login,
repo: context.payload.repository.name,
pull_number: context.payload.pull_request.number,
event: 'APPROVE'
})
github.pullRequests.merge({
owner: context.payload.repository.owner.login,
repo: context.payload.repository.name,
pull_number: context.payload.pull_request.number
})
github-token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,6 @@
"webpack": "^5.25.1"
},
"engines": {
"node": "^14 || ^15"
"node": ">=14"
}
}

1 comment on commit cd91b28

@vercel
Copy link

@vercel vercel bot commented on cd91b28 Mar 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.