Skip to content

Commit

Permalink
Merge pull request #790 from bendemboski/test-dependency-version
Browse files Browse the repository at this point in the history
Update app template dependency versions
  • Loading branch information
ef4 authored Apr 29, 2021
2 parents f67f013 + ce149f8 commit 0f3359a
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
tags:
- 'v*'
pull_request:
branches: [ master ]
branches: [master]

jobs:
discover_matrix:
Expand All @@ -28,14 +28,14 @@ jobs:
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- run: yarn
- run: yarn --frozen-lockfile
- id: set-matrix
run: echo "::set-output name=matrix::$(node ./test-packages/support/suite-setup-util.js --matrix)"

test:
needs: discover_matrix
name: ${{ matrix.name }}
runs-on: "${{ matrix.os }}-latest"
runs-on: '${{ matrix.os }}-latest'

strategy:
fail-fast: false
Expand All @@ -53,7 +53,7 @@ jobs:
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- run: yarn
- run: yarn --frozen-lockfile
- name: suite
run: ${{ matrix.command }}
working-directory: ${{ matrix.dir }}
6 changes: 3 additions & 3 deletions tests/app-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@ember/test-helpers": "^2.2.5",
"@embroider/compat": "0.39.1",
"@embroider/core": "0.39.1",
"@embroider/webpack": "0.39.1",
"@embroider/compat": "0.40.0",
"@embroider/core": "0.40.0",
"@embroider/webpack": "0.40.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
Expand Down
13 changes: 13 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1370,6 +1370,19 @@
"@embroider/sample-lib@link:test-packages/sample-lib":
version "0.0.0"

"@embroider/shared-internals@^0.39.1":
version "0.39.1"
resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.39.1.tgz#33c88778fc7c42ba20dbe625b34abe51816dfc77"
integrity sha512-fpENfZqPWd/JUlmpAW1pN967rxSoUg7dTGmkgtAt+UZQh/d4XMeyUGGHTkRToboKa0W19xRu64RZ9LT94xUkeQ==
dependencies:
ember-rfc176-data "^0.3.17"
fs-extra "^7.0.1"
lodash "^4.17.10"
pkg-up "^3.1.0"
resolve-package-path "^1.2.2"
semver "^7.3.2"
typescript-memoize "^1.0.0-alpha.3"

"@eslint/eslintrc@^0.4.0":
version "0.4.0"
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547"
Expand Down

0 comments on commit 0f3359a

Please sign in to comment.