diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ed51df05..5aac9b3c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ on:
pull_request:
env:
- NODE_VERSION: 10
+ NODE_VERSION: 16
jobs:
test:
@@ -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
@@ -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
@@ -47,11 +45,10 @@ 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
@@ -59,7 +56,40 @@ jobs:
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 }}
diff --git a/addon/constants/es-footer.js b/addon/constants/es-footer.js
index b8551b5b..019b2119 100644
--- a/addon/constants/es-footer.js
+++ b/addon/constants/es-footer.js
@@ -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'
}];
diff --git a/addon/templates/components/es-footer/es-statement.hbs b/addon/templates/components/es-footer/es-statement.hbs
index c8190f68..65f9e6bb 100644
--- a/addon/templates/components/es-footer/es-statement.hbs
+++ b/addon/templates/components/es-footer/es-statement.hbs
@@ -5,7 +5,7 @@