Skip to content

Commit

Permalink
Test workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
nadavshatz committed Jan 30, 2022
1 parent 2ada97d commit ec15a38
Show file tree
Hide file tree
Showing 8 changed files with 318 additions and 1,404 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

module.exports = {
root: true,
parser: 'babel-eslint',
parser: '@babel/eslint-parser',
parserOptions: {
requireConfigFile: false,
ecmaVersion: 2018,
sourceType: 'module',
ecmaFeatures: {
Expand Down
18 changes: 10 additions & 8 deletions .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,24 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: 12
- run: npm ci
- run: npm test
node-version: '16'
cache: 'yarn'
- run: yarn install --frozen-lockfile
- run: yarn run test

publish-npm:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/setup-node@v2
with:
node-version: 12
node-version: '16'
cache: 'yarn'
registry-url: https://registry.npmjs.org/
- run: npm ci
- run: npm publish
- run: yarn install --frozen-lockfile
- run: yarn publish
env:
NODE_AUTH_TOKEN: ${{secrets.npm_token}}
26 changes: 0 additions & 26 deletions .github/workflows/pr.yaml

This file was deleted.

23 changes: 9 additions & 14 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,17 @@ name: Pull request CI

on:
pull_request:
branches: [ master ]
branches: [master]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: 12.x
- uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- run: npm ci
- run: npm test
- uses: actions/checkout@v2
- name: Use Node.js
uses: actions/setup-node@v2
with:
node-version: '16'
cache: 'yarn'
- run: yarn install --frozen-lockfile
- run: yarn run test
33 changes: 0 additions & 33 deletions .github/workflows/release.yaml

This file was deleted.

78 changes: 25 additions & 53 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

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

module.exports = async function() {
return {
Expand All @@ -13,59 +13,31 @@ module.exports = async function() {
'ember-source': '~3.28.0'
}
}
},
{
name: 'ember-release',
npm: {
devDependencies: {
'ember-source': await getChannelURL('release')
}
}
},
{
name: 'ember-beta',
npm: {
devDependencies: {
'ember-source': await getChannelURL('beta')
}
}
},
{
name: 'ember-canary',
npm: {
devDependencies: {
'ember-source': await getChannelURL('canary')
}
}
},
{
name: 'ember-default-with-jquery',
env: {
EMBER_OPTIONAL_FEATURES: JSON.stringify({
'jquery-integration': true
})
},
npm: {
devDependencies: {
'@ember/jquery': '^0.5.1'
}
}
},
{
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'
}
}
}
// {
// name: 'ember-release',
// npm: {
// devDependencies: {
// 'ember-source': await getChannelURL('release')
// }
// }
// },
// {
// name: 'ember-beta',
// npm: {
// devDependencies: {
// 'ember-source': await getChannelURL('beta')
// }
// }
// },
// {
// name: 'ember-canary',
// npm: {
// devDependencies: {
// 'ember-source': await getChannelURL('canary')
// }
// }
// }
]
};
};
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,16 @@
"test:ember-compatibility": "ember try:each"
},
"dependencies": {
"ember-cli-babel": "^7.21.0",
"ember-cli-htmlbars": "^5.2.0"
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.0.1"
},
"devDependencies": {
"@ember/optional-features": "^1.3.0",
"@glimmer/component": "^1.0.1",
"@glimmer/tracking": "^1.0.0",
"@babel/eslint-parser": "^7.16.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^1.6.0",
"ember-auto-import": "^2.4.0",
"ember-cli": "~3.28.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-inject-live-reload": "^2.0.2",
Expand Down
Loading

0 comments on commit ec15a38

Please sign in to comment.