Skip to content

Commit 49e387b

Browse files
authored
Merge pull request #422 from ember-learn/fix-ci
Fix CI
2 parents 3cfa84d + 7b55b3f commit 49e387b

File tree

10 files changed

+25544
-30891
lines changed

10 files changed

+25544
-30891
lines changed

.github/workflows/ci.yml

Lines changed: 44 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,24 @@ concurrency:
1212
cancel-in-progress: true
1313

1414
jobs:
15-
test:
16-
name: "Tests"
15+
percy:
16+
name: "Percy Tests"
1717
runs-on: ubuntu-latest
1818
env:
1919
PERCY_TOKEN: ee0a9d5c1122d6a21852edf19b5b309aaec18077fb3900c98995c90bc48ed240
20-
RUN_PERCY_TESTS: true
20+
steps:
21+
- uses: actions/checkout@v2
22+
- uses: actions/setup-node@v3
23+
with:
24+
node-version: 14.x
25+
cache: npm
26+
- run: npm i -g npm@8
27+
- run: npm ci
28+
- run: npx percy exec -- npm run test:docs
29+
30+
test:
31+
name: "Tests"
32+
runs-on: ubuntu-latest
2133

2234
steps:
2335
- uses: actions/checkout@v2
@@ -60,12 +72,33 @@ jobs:
6072
- ember-lts-3.28
6173
- ember-release
6274
- ember-beta
63-
- ember-canary
6475
- ember-classic
6576
- ember-default-with-jquery
6677
- embroider-safe
6778
- embroider-optimized
6879
- no-deprecations
80+
81+
steps:
82+
- uses: actions/checkout@v2
83+
- uses: actions/setup-node@v3
84+
with:
85+
node-version: 14.x
86+
cache: npm
87+
- run: npm i -g npm@8
88+
- run: npm ci
89+
- name: Run Tests
90+
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
91+
92+
allow-fail-try-scenarios:
93+
name: ${{ matrix.try-scenario }} - Allowed to fail
94+
runs-on: ubuntu-latest
95+
needs: 'test'
96+
97+
strategy:
98+
fail-fast: false
99+
matrix:
100+
try-scenario:
101+
- ember-canary
69102
- ember-release-no-deprecations
70103

71104
steps:
@@ -77,4 +110,11 @@ jobs:
77110
- run: npm i -g npm@8
78111
- run: npm ci
79112
- name: Run Tests
113+
id: tests
80114
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
115+
continue-on-error: true
116+
- uses: mainmatter/continue-on-error-comment@v1
117+
with:
118+
repo-token: ${{ secrets.GITHUB_TOKEN }}
119+
outcome: ${{ steps.tests.outcome }}
120+
test-id: ${{ matrix.try-scenario }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
# compiled output
44
/dist/
5+
/dist-*
56
/tmp/
67

78
# dependencies

config/ember-try.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ module.exports = async function () {
4444
devDependencies: {
4545
'ember-source': await getChannelURL('release'),
4646
},
47+
overrides: {
48+
'ember-source': '$ember-source',
49+
},
4750
},
4851
},
4952
{
@@ -52,6 +55,9 @@ module.exports = async function () {
5255
devDependencies: {
5356
'ember-source': await getChannelURL('beta'),
5457
},
58+
overrides: {
59+
'ember-source': '$ember-source',
60+
},
5561
},
5662
},
5763
{
@@ -60,6 +66,9 @@ module.exports = async function () {
6066
devDependencies: {
6167
'ember-source': await getChannelURL('canary'),
6268
},
69+
overrides: {
70+
'ember-source': '$ember-source',
71+
},
6372
},
6473
},
6574
{
@@ -110,6 +119,9 @@ module.exports = async function () {
110119
'ember-source': await getChannelURL('release'),
111120
'ember-deprecation-error': '*',
112121
},
122+
overrides: {
123+
'ember-source': '$ember-source',
124+
},
113125
},
114126
},
115127
],

config/index.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
module.exports = function (/* environment */) {
2+
return {
3+
'field-guide': {
4+
name: 'Ember',
5+
tagLine: 'Ember Styleguide',
6+
logo: '/ember-logo.png',
7+
copyright:
8+
'Ember Field Guide is designed to document the [ember-styleguide](https://github.com/ember-learn/ember-styleguide) project. For more information view the [README](https://github.com/ember-learn/ember-styleguide),',
9+
github: 'https://github.com/ember-learn/ember-styleguide',
10+
},
11+
};
12+
};
13+
14+
module.exports['ember-cli-build'] = {
15+
fingerprint: {
16+
extensions: ['js', 'css', 'map'],
17+
},
18+
};

docs-styles/app.css

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
.self-executing-code-block {
2+
margin-bottom: 2rem;
3+
}
4+
5+
@media only percy {
6+
.hide-in-percy {
7+
visibility: hidden;
8+
}
9+
}
10+
11+
.border-dashed {
12+
border: 1px dashed var(--color-gray-500);
13+
}
14+
15+
.spacer-xsmall {
16+
height: var(--spacing-1);
17+
}
18+
19+
.spacer-small {
20+
height: var(--spacing-2);
21+
}
22+
23+
.spacer-medium {
24+
height: var(--spacing-3);
25+
}
26+
27+
.spacer-large {
28+
height: var(--spacing-4);
29+
}
30+
31+
.spacer-xlarge {
32+
height: var(--spacing-5);
33+
}

0 commit comments

Comments
 (0)