Skip to content
Open
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
44 changes: 37 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:

env:
NODE_VERSION: 10
NODE_VERSION: 16

jobs:
test:
Expand All @@ -22,7 +22,6 @@ jobs:
with:
node-version: ${{ env.NODE_VERSION }}

- run: npm i -g npm@7
- run: npm ci
- run: npm run lint:hbs
- run: npm run lint:js
Expand All @@ -38,7 +37,6 @@ jobs:
with:
node-version: ${{ env.NODE_VERSION }}

- run: npm i -g npm@7
- run: npm install --no-package-lock
- run: npm run test

Expand All @@ -47,19 +45,51 @@ jobs:
runs-on: ubuntu-latest
needs: test
strategy:
fail-fast: false
matrix:
scenario:
- 'ember-release'
- 'ember-beta'
- 'ember-canary'
- 'ember-lts-3.28'
- 'ember-default-with-jquery'
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: ${{ env.NODE_VERSION }}

- run: npm i -g npm@7
- run: npm ci
- name: Test
run: npx ember try:one $EMBER_TRY_SCENARIO ${{ matrix.scenario }}

allow-fail-try-scenarios:
name: ${{ matrix.try-scenario }} - Allowed to fail
runs-on: ubuntu-latest
needs: 'test'

permissions:
pull-requests: write

strategy:
fail-fast: false
matrix:
try-scenario:
- ember-release
- ember-beta
- ember-canary
- ember-release-no-deprecations

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}
cache: npm
- run: npm ci
- name: Run Tests
id: tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
continue-on-error: true
- uses: mainmatter/continue-on-error-comment@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
outcome: ${{ steps.tests.outcome }}
test-id: ${{ matrix.try-scenario }}
8 changes: 7 additions & 1 deletion addon/constants/es-footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ const socialLinks = [{
}, {
title: 'Discord',
href: 'https://discordapp.com/invite/zT3asNS',
class: 'discord-logo'
class: 'discord-logo',
label: 'Join the Ember Community Discord'
}, {
title: 'Mastodon',
href: 'https://hachyderm.io/@emberjs',
class: 'mastodon-logo',
label: 'Official Ember Mastodon Account'
}];


Expand Down
2 changes: 1 addition & 1 deletion addon/templates/components/es-footer/es-statement.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<p class="footer-tagline">{{tagline}}</p>
<div class="footer-social">
{{#each socialLinks as |link|}}
<a href={{link.href}} title={{link.title}}>
<a href={{link.href}} title={{link.title}} rel="me">
{{svg-jar link.class}}
</a>
{{/each}}
Expand Down
12 changes: 2 additions & 10 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,10 @@ module.exports = async function() {
return {
scenarios: [
{
name: 'ember-lts-3.4',
name: 'ember-lts-3.28',
npm: {
devDependencies: {
'ember-source': '~3.4.0'
}
}
},
{
name: 'ember-lts-3.8',
npm: {
devDependencies: {
'ember-source': '~3.8.0'
'ember-source': '~3.28.0'
}
}
},
Expand Down
Loading