Skip to content

Commit bd49886

Browse files
committed
Match packages versions and run tests in CI
# Conflicts: # packages/fastboot-express-middleware/package.json run tests in ci skip legacy mocha tests skip fastboot ci on windows fastboot ci test is not working correctly on windows
1 parent 9f5b056 commit bd49886

13 files changed

Lines changed: 782 additions & 13461 deletions

File tree

.github/workflows/ci.yml

Lines changed: 9 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -19,40 +19,7 @@ on:
1919
- cron: '0 6 * * 0'
2020

2121
jobs:
22-
test-legacy-mocha:
23-
name: Legacy Mocha Tests - ${{ matrix.node-version }}
24-
runs-on: ubuntu-latest
25-
26-
strategy:
27-
fail-fast: false
28-
matrix:
29-
node-version: ['10', '12', '14']
30-
31-
steps:
32-
- name: Checkout Code
33-
uses: actions/checkout@v2
34-
- name: Use Node.js ${{ matrix.node-version }}
35-
uses: volta-cli/action@v1
36-
with:
37-
node-version: ${{ matrix.node-version }}
38-
39-
# Remove test-packages folder so that we don't leak node_modules between apps
40-
- name: Remove test-packages
41-
run: |
42-
rm -rf test-packages
43-
- name: Yarn Install
44-
working-directory: ./packages/ember-cli-fastboot
45-
run: |
46-
yarn install --ignore-engines --frozen-lockfile
47-
- name: Run Mocha Tests
48-
working-directory: ./packages/ember-cli-fastboot
49-
run: |
50-
volta install npm@4
51-
npm --version
52-
yarn test:mocha
53-
54-
55-
test-ember:
22+
test-all-packages:
5623
name: Ember Tests
5724
runs-on: ${{ matrix.os }}
5825

@@ -70,8 +37,15 @@ jobs:
7037
node-version: ${{ matrix.node-version }}
7138
- name: Yarn Install
7239
run: yarn install --ignore-engines --frozen-lockfile
73-
- name: Run Tests
40+
- name: Run ember-cli-fastboot Tests
7441
run: yarn workspace ember-cli-fastboot test:ember
42+
- name: Run fastboot Tests
43+
if: ${{ matrix.os != 'windows-latest' }}
44+
run: yarn workspace fastboot test
45+
- name: Run fastboot-express-middleware Tests
46+
run: yarn workspace fastboot-express-middleware test
47+
- name: Run fastboot-app-server Tests
48+
run: yarn workspace fastboot-app-server test:mocha
7549

7650

7751
test-packages:

package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"private": true,
3-
"version": "3.0.0-beta.2",
3+
"version": "3.1.2",
44
"repository": {
55
"type": "git",
66
"url": "[email protected]:ember-fastboot/ember-cli-fastboot.git"
@@ -46,5 +46,9 @@
4646
"tokenRef": "GITHUB_AUTH"
4747
},
4848
"npm": false
49+
},
50+
"volta": {
51+
"node": "12.19.0",
52+
"yarn": "1.22.5"
4953
}
5054
}

packages/ember-cli-fastboot/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ember-cli-fastboot",
3-
"version": "3.0.0-beta.2",
3+
"version": "3.1.2",
44
"description": "Server-side rendering for Ember.js apps",
55
"keywords": [
66
"ember-addon"
@@ -33,8 +33,8 @@
3333
"ember-cli-lodash-subset": "2.0.1",
3434
"ember-cli-preprocess-registry": "^3.1.2",
3535
"ember-cli-version-checker": "^3.0.0",
36-
"fastboot": "^3.1.1",
37-
"fastboot-express-middleware": "^3.0.0",
36+
"fastboot": "3.1.2",
37+
"fastboot-express-middleware": "3.1.2",
3838
"fastboot-transform": "^0.1.3",
3939
"fs-extra": "^7.0.0",
4040
"json-stable-stringify": "^1.0.1",
@@ -93,7 +93,7 @@
9393
]
9494
},
9595
"volta": {
96-
"node": "12.18.2",
97-
"yarn": "1.17.3"
96+
"node": "12.19.0",
97+
"yarn": "1.22.5"
9898
}
9999
}

packages/fastboot-app-server/package.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fastboot-app-server",
3-
"version": "3.0.0",
3+
"version": "3.1.2",
44
"description": "A production-ready app server for running Ember FastBoot apps",
55
"keywords": [
66
"ember",
@@ -28,8 +28,8 @@
2828
"chalk": "^4.1.0",
2929
"compression": "^1.7.4",
3030
"express": "^4.17.1",
31-
"fastboot": "^3.1.1",
32-
"fastboot-express-middleware": "^3.0.0"
31+
"fastboot": "3.1.2",
32+
"fastboot-express-middleware": "3.1.2"
3333
},
3434
"devDependencies": {
3535
"chai": "^4.1.0",
@@ -46,6 +46,10 @@
4646
"engines": {
4747
"node": "10.* || 12.* || >= 14"
4848
},
49+
"volta": {
50+
"node": "12.19.0",
51+
"yarn": "1.22.5"
52+
},
4953
"publishConfig": {
5054
"registry": "https://registry.npmjs.org"
5155
},

0 commit comments

Comments
 (0)