Skip to content

Commit ad1a07c

Browse files
authored
fix ci (#428)
1 parent 585e8cc commit ad1a07c

File tree

3 files changed

+1060
-101
lines changed

3 files changed

+1060
-101
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on: [push, pull_request]
33
jobs:
44
try:
55
runs-on: ubuntu-latest
6+
timeout-minutes: 15
67
strategy:
78
matrix:
89
ember-version:
@@ -18,18 +19,19 @@ jobs:
1819

1920
steps:
2021
- uses: actions/checkout@v2
21-
- uses: actions/setup-node@v1.1.0
22+
- uses: actions/setup-node@v2.1.5
2223
- run: yarn install
2324
- run: node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
2425
continue-on-error: ${{ matrix.ember-version == 'ember-canary' }}
2526

2627
docs:
2728
runs-on: ubuntu-latest
29+
timeout-minutes: 15
2830
needs: []
2931
if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')
3032
steps:
3133
- uses: actions/checkout@v2
32-
- uses: actions/setup-node@v1.1.0
34+
- uses: actions/setup-node@v2.1.5
3335
- run: yarn install
3436
- uses: webfactory/ssh-agent@v0.1.1
3537
with:

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@
3333
"devDependencies": {
3434
"@ember/jquery": "^1.1.0",
3535
"@ember/optional-features": "^1.0.0",
36+
"@fortawesome/ember-fontawesome": "^0.2.3",
37+
"@fortawesome/free-solid-svg-icons": "^5.15.2",
3638
"babel-eslint": "^10.0.3",
3739
"broccoli-asset-rev": "^3.0.0",
38-
"ember-auto-import": "^1.5.3",
3940
"ember-ajax": "^5.0.0",
41+
"ember-auto-import": "^1.5.3",
4042
"ember-cli": "~3.16.0",
4143
"ember-cli-addon-docs": "0.10.0",
4244
"ember-cli-addon-docs-yuidoc": "^0.2.3",
@@ -61,7 +63,6 @@
6163
"ember-disable-prototype-extensions": "^1.1.3",
6264
"ember-export-application-global": "^2.0.0",
6365
"ember-fetch": "^8.0.0",
64-
"ember-font-awesome": "4.0.0-rc.4",
6566
"ember-load-initializers": "^2.0.0",
6667
"ember-maybe-import-regenerator": "^0.1.6",
6768
"ember-qunit-assert-helpers": "^0.2.1",

0 commit comments

Comments
 (0)