Skip to content

Commit

Permalink
Merge pull request #223 from NullVoxPopuli/use-volta-for-ci
Browse files Browse the repository at this point in the history
Use volta for ci + support Ember Beta v4.x and Canary by upgrading ember-auto-import to v2.x in devDependencies.
  • Loading branch information
raido committed Oct 27, 2021
2 parents 136ca56 + a41618b commit 46f5600
Show file tree
Hide file tree
Showing 4 changed files with 3,446 additions and 5,796 deletions.
20 changes: 7 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- uses: actions/setup-node@v2-beta
with:
node-version: '12.x'
- uses: volta-cli/action@v1
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Lint
Expand All @@ -29,14 +27,15 @@ jobs:
matrix:
os: [ubuntu-latest]
browser: [chrome, firefox]
node: ["12", "14", "16"]

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- uses: actions/setup-node@v2-beta
- uses: volta-cli/action@v1
with:
node-version: '12.x'
node-version: ${{ matrix.node }}
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Test
Expand All @@ -57,9 +56,7 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- uses: actions/setup-node@v2-beta
with:
node-version: '12.x'
- uses: volta-cli/action@v1
- name: Install Dependencies
run: yarn install --no-lockfile --non-interactive
- name: Test
Expand All @@ -80,25 +77,22 @@ jobs:
ember-lts-3.24,
ember-lts-3.28,
ember-release,
ember-beta,
ember-default-with-jquery,
ember-classic,
embroider-safe,
embroider-optimized
]
allow-failure: [false]
include:
- ember-try-scenario: ember-beta # We temporarily allow it to fail, so we can cut major release for current v3.x Ember and then upgrade to Embroider 2.x with another major release.
allow-failure: true
- ember-try-scenario: ember-canary
allow-failure: true

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- uses: actions/setup-node@v2-beta
with:
node-version: '12.x'
- uses: volta-cli/action@v1
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Test
Expand Down
8 changes: 8 additions & 0 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,18 @@
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function (defaults) {
let environment = EmberAddon.env();
let isDeploying = environment === 'production';

let app = new EmberAddon(defaults, {
'ember-cli-babel': {
includePolyfill: true,
},
autoImport: isDeploying
? {
publicAssetURL: 'https://ember-cli.github.io/ember-page-title',
}
: {},
fingerprint: {
extensions: [
'js',
Expand Down
8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^1.11.3",
"ember-auto-import": "^2.0.0",
"ember-cli": "~3.28.3",
"ember-cli-code-coverage": "^1.0.0",
"ember-cli-dependency-checker": "^3.2.0",
Expand Down Expand Up @@ -77,7 +77,8 @@
"prettier": "^2.3.2",
"qunit": "^2.16.0",
"sass": "^1.43.3",
"standard-version": "^9.3.2"
"standard-version": "^9.3.2",
"webpack": "^5.0.0"
},
"engines": {
"node": "12.* || 14.* || >= 16"
Expand All @@ -91,6 +92,7 @@
},
"homepage": "https://ember-cli.github.io/ember-page-title",
"volta": {
"node": "12.22.1"
"node": "12.22.6",
"yarn": "1.22.15"
}
}
Loading

0 comments on commit 46f5600

Please sign in to comment.