Skip to content

Commit c49b9e7

Browse files
Merge pull request #122 from amclin/dependabot/add-v2-config-file
Upgrade to GitHub-native Dependabot
2 parents 37d146f + c1c500f commit c49b9e7

File tree

6 files changed

+68
-34
lines changed

6 files changed

+68
-34
lines changed

.dependabot/config.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: npm
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
time: "13:00"
8+
open-pull-requests-limit: 10
9+
commit-message:
10+
prefix: fix
11+
prefix-development: refactor
12+
include: scope

.github/workflows/automerge.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Automerge
2+
3+
on:
4+
check_suite:
5+
types:
6+
- completed
7+
8+
jobs:
9+
automerge:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Automerge Dev Dependency Updates
13+
uses: ridedott/merge-me-action@v2
14+
if: |
15+
github.actor == 'dependabot[bot]' &&
16+
github.event_name == 'pull_request' &&
17+
startsWith(github.event.pull_request.title, 'refactor(deps-dev):')
18+
with:
19+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
20+
- name: Automerge Dependency Updates
21+
uses: ridedott/merge-me-action@v2
22+
if: |
23+
github.actor == 'dependabot[bot]' &&
24+
github.event_name == 'pull_request' &&
25+
startsWith(github.event.pull_request.title, 'fix(deps):')
26+
with:
27+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/run-tests.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,17 @@ jobs:
2525
uses: actions/setup-node@v2
2626
with:
2727
node-version: ${{ matrix.node-version }}
28+
- uses: actions/setup-java@v1
29+
with:
30+
java-version: 11
31+
# Set up dependency cache
32+
- name: Cache local Maven repository
33+
uses: actions/cache@v2
34+
with:
35+
path: ~/.m2/repository
36+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
37+
restore-keys: |
38+
${{ runner.os }}-maven-
2839
- run: npm ci
2940
- run: npm run build --if-present
3041
- run: npm test

package-lock.json

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@semantic-release/github": "^7.2.2",
2020
"@semantic-release/npm": "^7.1.3",
2121
"aem-clientlib-generator": "^1.7.5",
22-
"aem-packager": "^2.0.8",
22+
"aem-packager": "^2.0.13",
2323
"standard": "^16.0.3"
2424
},
2525
"aem-packager": {

0 commit comments

Comments
 (0)