Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH Actions #688

Merged
merged 2 commits into from
Sep 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,3 @@ updates:
time: "03:00"
open-pull-requests-limit: 10
versioning-strategy: increase
ignore:
- dependency-name: ember-cli
versions:
- 3.23.0
- 3.24.0
- 3.25.0
- dependency-name: eslint-plugin-ember
versions:
- 10.1.1
- 10.2.0
- dependency-name: ember-source
versions:
- 3.24.0
- 3.24.1
- 3.25.1
73 changes: 73 additions & 0 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
name: CI Build

on:
push:
branches:
- master
- 'v*'
pull_request:
schedule:
- cron: '0 3 * * *' # daily, at 3am

jobs:
test:
timeout-minutes: 10
name: Tests
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
with:
node-version: 10.x
- run: yarn install --frozen-lockfile
- run: yarn lint
- run: yarn test

floating-dependencies:
timeout-minutes: 10
name: "Floating Dependencies"
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
with:
node-version: 12.x
- run: yarn install --no-lockfile
- run: yarn test

try-scenarios:
timeout-minutes: 10
name: "Try: ${{ matrix.ember-try-scenario }}"

runs-on: ubuntu-latest

needs: test

strategy:
fail-fast: false
matrix:
ember-try-scenario:
- ember-lts-3.8
- ember-lts-3.12
- ember-lts-3.16
- ember-lts-3.20
- ember-lts-3.24
- ember-release
# - ember-beta
# - ember-canary
- ember-classic
- ember-default-with-jquery
# - embroider-safe
# - embroider-optimized

steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
with:
node-version: 12.x
- name: install dependencies
run: yarn install --frozen-lockfile
- name: test
run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
66 changes: 0 additions & 66 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Ember Resolver [![Build Status](https://travis-ci.org/ember-cli/ember-resolver.svg?branch=master)](https://travis-ci.org/ember-cli/ember-resolver)
# Ember Resolver [![CI Build](https://github.com/ember-cli/ember-resolver/actions/workflows/ci-build.yml/badge.svg)](https://github.com/ember-cli/ember-resolver/actions/workflows/ci-build.yml)

The Ember Resolver is the mechanism responsible for looking up code in your application and converting its naming conventions into the actual classes, functions, and templates that Ember needs to resolve its dependencies, for example, what template to render for a given route. It is a system that helps the app resolve the lookup of JavaScript modules agnostic of what kind of module system is used, which can be AMD, CommonJS or just plain globals. It is used to lookup routes, models, components, templates, or anything that is used in your Ember app.

Expand Down
101 changes: 96 additions & 5 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,99 @@

const getChannelURL = require('ember-source-channel-url');

const EMBROIDER_VERSION = '^0.44.1';
const embroider = {
safe: {
name: 'embroider-safe',
npm: {
devDependencies: {
'@embroider/core': EMBROIDER_VERSION,
'@embroider/webpack': EMBROIDER_VERSION,
'@embroider/compat': EMBROIDER_VERSION,
'@embroider/test-setup': EMBROIDER_VERSION,

// Webpack is a peer dependency of `@embroider/webpack`
webpack: '^5.0.0',
},
},
env: {
EMBROIDER_TEST_SETUP_OPTIONS: 'safe',
},
},

optimized: {
name: 'embroider-optimized',
npm: {
devDependencies: {
'@embroider/core': EMBROIDER_VERSION,
'@embroider/webpack': EMBROIDER_VERSION,
'@embroider/compat': EMBROIDER_VERSION,
'@embroider/test-setup': EMBROIDER_VERSION,

// Webpack is a peer dependency of `@embroider/webpack`
webpack: '^5.0.0',
},
},
env: {
EMBROIDER_TEST_SETUP_OPTIONS: 'optimized',
},
},
};


module.exports = async function() {
return {
useYarn: true,
scenarios: [
{
name: 'ember-lts-3.4',
name: 'ember-lts-3.8',
npm: {
devDependencies: {
'ember-source': '~3.4.0'
'ember-source': '~3.8.0'
}
}
},
{
name: 'ember-lts-3.8',
name: 'ember-lts-3.12',
npm: {
devDependencies: {
'ember-source': '~3.8.0'
'ember-source': '~3.12.0'
}
}
},
{
name: 'ember-lts-3.16',
npm: {
devDependencies: {
'ember-source': '~3.16.0'
}
}
},
{
name: 'ember-lts-3.16',
npm: {
devDependencies: {
'ember-source': '~3.16.0'
}
}
},
{
name: 'ember-lts-3.20',
npm: {
devDependencies: {
'ember-source': '~3.20.0'
}
}
},
{
name: 'ember-lts-3.24',
npm: {
devDependencies: {
'ember-source': '~3.24.0'
}
}
},

{
name: 'ember-release',
npm: {
Expand All @@ -46,6 +119,21 @@ module.exports = async function() {
}
}
},
{
name: 'ember-classic',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'application-template-wrapper': true,
'default-async-observers': false,
'template-only-glimmer-components': false,
}),
},
npm: {
ember: {
edition: 'classic',
},
},
},
// The default `.travis.yml` runs this scenario via `yarn test`,
// not via `ember try`. It's still included here so that running
// `ember try:each` manually or from a customized CI config will run it
Expand All @@ -68,7 +156,10 @@ module.exports = async function() {
'@ember/jquery': '^0.5.1'
}
}
}
},

embroider.safe,
embroider.optimized,
]
};
};
20 changes: 12 additions & 8 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,16 @@ module.exports = function(defaults) {
}
});

/*
This build file specifies the options for the dummy test app of this
addon, located in `/tests/dummy`
This build file does *not* influence how the addon or the app using it
behave. You most likely want to be modifying `./index.js` or app's build file
*/

return app.toTree();
try {
const { maybeEmbroider } = require('@embroider/test-setup'); // eslint-disable-line node/no-missing-require
return maybeEmbroider(app);
} catch (e) {
// This exists, so that we can continue to support node 10 for some of our
// test scenarios. Specifically those not scenario testing embroider. As
// @embroider/test-setup and @embroider in no longer supports node 10
if (e !== null && typeof e === 'object' && e.code === 'MODULE_NOT_FOUND') {
return app.toTree();
}
throw e;
}
};
6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
},
"scripts": {
"build": "ember build",
"lint": "npm-run-all lint:*",
"lint:js": "eslint .",
"start": "ember serve",
"test": "ember test",
Expand Down Expand Up @@ -54,6 +55,7 @@
"eslint-plugin-ember": "^7.8.1",
"eslint-plugin-node": "^11.1.0",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"qunit-dom": "^1.6.0",
"release-it": "^14.10.1",
"release-it-lerna-changelog": "^3.1.0"
Expand Down Expand Up @@ -81,5 +83,9 @@
"release": true,
"tokenRef": "GITHUB_AUTH"
}
},
"volta": {
"node": "10.24.1",
"yarn": "1.22.11"
}
}
Loading