Skip to content

Commit 8e9a14d

Browse files
authored
Merge pull request #176 from ember-cli-deploy/update-deps
[BREAKING] update dependencies and node version requirements
2 parents e365de9 + 85a5e11 commit 8e9a14d

File tree

3 files changed

+827
-451
lines changed

3 files changed

+827
-451
lines changed

.github/workflows/ci.yml

Lines changed: 25 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,40 @@
1-
name: CI
1+
name: Continuous Integration
22

33
on:
44
push:
5-
branches:
6-
- master
75
pull_request:
86

9-
env:
10-
NODE_VERSION: '12.x'
11-
127
jobs:
138
test:
14-
name: Tests
9+
name: Test
1510
runs-on: ubuntu-latest
16-
11+
strategy:
12+
matrix:
13+
node-version: [14.x, 16.x, 18.x, 20.x]
1714
steps:
1815
- uses: actions/checkout@v2
16+
- name: Use Node.js ${{ matrix.node-version }}
17+
uses: actions/setup-node@v3
1918
with:
20-
fetch-depth: 1
21-
22-
- uses: actions/setup-node@v2-beta
23-
with:
24-
node-version: '${{ env.NODE_VERSION }}'
25-
26-
- name: Get package manager's global cache path
27-
id: global-cache-dir-path
28-
run: echo "::set-output name=dir::$(yarn cache dir)"
19+
node-version: ${{ matrix.node-version }}
20+
cache: 'yarn'
21+
- run: yarn install
22+
- run: yarn test
2923

30-
- name: Cache package manager's global cache and node_modules
31-
id: cache-dependencies
32-
uses: actions/cache@v2
24+
test-floating:
25+
name: Floating Dependencies
26+
runs-on: ubuntu-latest
27+
strategy:
28+
matrix:
29+
node-version: [14.x, 16.x, 18.x, 20.x]
30+
steps:
31+
- uses: actions/checkout@v2
32+
- name: Use Node.js ${{ matrix.node-version }}
33+
uses: actions/setup-node@v3
3334
with:
34-
path: |
35-
${{ steps.global-cache-dir-path.outputs.dir }}
36-
node_modules
37-
key: v1-${{ runner.os }}-${{ matrix.node-version }}-${{
38-
hashFiles('**/yarn.lock'
39-
) }}
40-
restore-keys: |
41-
v1-${{ runner.os }}-${{ matrix.node-version }}-
42-
43-
- name: Install Dependencies
35+
node-version: ${{ matrix.node-version }}
36+
cache: 'yarn'
37+
- name: install dependencies
4438
run: yarn install --no-lockfile
45-
if: |
46-
steps.cache-dependencies.outputs.cache-hit != 'true'
47-
48-
- name: Test
39+
- name: test
4940
run: yarn test
50-
51-

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,27 @@
2121
"aws-sdk": "^2.1354.0",
2222
"chalk": "^4.1.0",
2323
"core-object": "^3.1.5",
24-
"ember-cli-deploy-plugin": "^0.2.2",
24+
"ember-cli-deploy-plugin": "^0.2.9",
2525
"lodash": "^4.17.21",
26-
"mime": "^2.5.2",
26+
"mime": "^3.0.0",
2727
"minimatch": "^3.0.3",
2828
"proxy-agent": "^5.0.0",
2929
"rsvp": "^4.8.5"
3030
},
3131
"devDependencies": {
32-
"chai": "^4.3.3",
32+
"chai": "^4.3.7",
3333
"chai-as-promised": "^7.1.1",
34-
"ember-cli": "^3.25.2",
35-
"eslint": "^7.21.0",
34+
"ember-cli": "^3.28.6",
35+
"eslint": "^8.42.0",
3636
"github": "^14.0.0",
37-
"glob": "^7.1.1",
37+
"glob": "^10.2.6",
3838
"mocha": "^8.3.1",
3939
"multiline": "^2.0.0",
4040
"release-it": "14.4.1",
4141
"release-it-lerna-changelog": "^3.1.0"
4242
},
4343
"engines": {
44-
"node": ">= 10.*"
44+
"node": "14.x || 16.x || 18.x || >= 20.*"
4545
},
4646
"ember-addon": {
4747
"before": "ember-cli-deploy-redis"
@@ -64,7 +64,7 @@
6464
}
6565
},
6666
"volta": {
67-
"node": "16.13.2",
67+
"node": "16.20.0",
6868
"yarn": "1.22.17"
6969
}
7070
}

0 commit comments

Comments
 (0)