Skip to content
This repository was archived by the owner on Oct 9, 2024. It is now read-only.

Commit 3b1c70a

Browse files
Add automerge, use node 12 for tests (#304)
* Add automerge, use node 12 for tests * Update main.yml
1 parent 3ae037e commit 3b1c70a

2 files changed

Lines changed: 14 additions & 6 deletions

File tree

.github/workflows/main.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,25 @@ jobs:
1717
- uses: actions/checkout@v2
1818
- uses: volta-cli/action@v1
1919
with:
20-
node-version: 10.x
20+
node-version: 12.x
2121
- run: yarn install --frozen-lockfile
2222
- run: yarn lint
2323
- run: yarn test:ember
2424

2525
floating-dependencies:
26-
name: "Floating Dependencies"
26+
name: 'Floating Dependencies'
2727
runs-on: ubuntu-latest
2828

2929
steps:
3030
- uses: actions/checkout@v2
3131
- uses: volta-cli/action@v1
3232
with:
33-
node-version: 10.x
33+
node-version: 12.x
3434
- run: yarn install --no-lockfile
3535
- run: yarn test:ember
3636

3737
try-scenarios:
38-
name: "Try: ${{ matrix.ember-try-scenario }}"
38+
name: 'Try: ${{ matrix.ember-try-scenario }}'
3939
runs-on: ubuntu-latest
4040
needs: test
4141

@@ -67,4 +67,12 @@ jobs:
6767
run: yarn install --frozen-lockfile
6868
- name: test
6969
run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
70-
continue-on-error: ${{ matrix.allow-failure }}
70+
continue-on-error: ${{ matrix.allow-failure }}
71+
72+
automerge:
73+
needs: [test, floating-dependencies, try-scenarios]
74+
runs-on: ubuntu-latest
75+
steps:
76+
- uses: fastify/github-action-merge-dependabot@v2.0.0
77+
with:
78+
github-token: ${{secrets.GITHUB_TOKEN}}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
}
101101
},
102102
"volta": {
103-
"node": "10.24.0",
103+
"node": "12.22.1",
104104
"yarn": "1.22.10"
105105
}
106106
}

0 commit comments

Comments
 (0)