Skip to content

Commit b259c02

Browse files
NullVoxPopuliNullVoxPopuli
authored
Merge branch 'master' into patch-1
2 parents e740577 + 1fded0e commit b259c02

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+8555
-3429
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ jobs:
2121
- uses: actions/checkout@v2
2222
- uses: actions/setup-node@v3
2323
with:
24-
node-version: 14.x
24+
node-version: 18.x
2525
cache: npm
26-
- run: npm i -g npm@8
2726
- run: npm ci
2827
- run: npx percy exec -- npm run test:docs
2928

@@ -36,9 +35,8 @@ jobs:
3635
- uses: mansona/npm-lockfile-version@v1
3736
- uses: actions/setup-node@v3
3837
with:
39-
node-version: 14.x
38+
node-version: 18.x
4039
cache: npm
41-
- run: npm i -g npm@8
4240
- run: npm ci
4341
- run: npm run lint
4442
- run: npx percy exec -- npm run test
@@ -51,9 +49,8 @@ jobs:
5149
- uses: actions/checkout@v2
5250
- uses: actions/setup-node@v3
5351
with:
54-
node-version: 14.x
52+
node-version: 18.x
5553
cache: npm
56-
- run: npm i -g npm@8
5754
- run: npm install --no-shrinkwrap
5855
- run: npm run test:ember
5956

@@ -66,9 +63,6 @@ jobs:
6663
fail-fast: false
6764
matrix:
6865
try-scenario:
69-
- ember-lts-3.16
70-
- ember-lts-3.20
71-
- ember-lts-3.24
7266
- ember-lts-3.28
7367
- ember-release
7468
- ember-beta
@@ -82,9 +76,8 @@ jobs:
8276
- uses: actions/checkout@v2
8377
- uses: actions/setup-node@v3
8478
with:
85-
node-version: 14.x
79+
node-version: 18.x
8680
cache: npm
87-
- run: npm i -g npm@8
8881
- run: npm ci
8982
- name: Run Tests
9083
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
@@ -107,9 +100,8 @@ jobs:
107100
- uses: actions/checkout@v2
108101
- uses: actions/setup-node@v3
109102
with:
110-
node-version: 14.x
103+
node-version: 18.x
111104
cache: npm
112-
- run: npm i -g npm@8
113105
- run: npm ci
114106
- name: Run Tests
115107
id: tests

‎.github/workflows/gh-pages.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
name: github pages
1+
name: Lint to the Future Dashboard
22

33
on:
44
push:
55
branches:
66
- master
7+
- main
78

89
jobs:
910
deploy:
10-
uses: mansona/lint-to-the-future-dashboard-action/.github/workflows/dashboard.yml@main
11-
with:
12-
folder: ''
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
- uses: mansona/lttf-dashboard@v1
15+
with:
16+
token: ${{secrets.GITHUB_TOKEN}}

‎.github/workflows/plan-release.yml‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
name: Release Plan Review
2+
on:
3+
push:
4+
branches:
5+
- main
6+
- master
7+
pull_request:
8+
types:
9+
- labeled
10+
11+
concurrency:
12+
group: plan-release # only the latest one of these should ever be running
13+
cancel-in-progress: true
14+
15+
jobs:
16+
check-plan:
17+
name: "Check Release Plan"
18+
runs-on: ubuntu-latest
19+
outputs:
20+
command: ${{ steps.check-release.outputs.command }}
21+
22+
steps:
23+
- uses: actions/checkout@v4
24+
with:
25+
fetch-depth: 0
26+
ref: 'master'
27+
# This will only cause the `check-plan` job to have a "command" of `release`
28+
# when the .release-plan.json file was changed on the last commit.
29+
- id: check-release
30+
run: if git diff --name-only HEAD HEAD~1 | grep -w -q ".release-plan.json"; then echo "command=release"; fi >> $GITHUB_OUTPUT
31+
32+
prepare_release_notes:
33+
name: Prepare Release Notes
34+
runs-on: ubuntu-latest
35+
timeout-minutes: 5
36+
needs: check-plan
37+
permissions:
38+
contents: write
39+
pull-requests: write
40+
outputs:
41+
explanation: ${{ steps.explanation.outputs.text }}
42+
# only run on push event if plan wasn't updated (don't create a release plan when we're releasing)
43+
# only run on labeled event if the PR has already been merged
44+
if: (github.event_name == 'push' && needs.check-plan.outputs.command != 'release') || (github.event_name == 'pull_request' && github.event.pull_request.merged == true)
45+
46+
steps:
47+
- uses: actions/checkout@v4
48+
# We need to download lots of history so that
49+
# github-changelog can discover what's changed since the last release
50+
with:
51+
fetch-depth: 0
52+
ref: 'master'
53+
- uses: actions/setup-node@v4
54+
with:
55+
node-version: 18
56+
57+
- run: npm ci
58+
59+
- name: "Generate Explanation and Prep Changelogs"
60+
id: explanation
61+
run: |
62+
set +e
63+
64+
npx release-plan prepare 2> >(tee -a release-plan-stderr.txt >&2)
65+
66+
67+
if [ $? -ne 0 ]; then
68+
echo 'text<<EOF' >> $GITHUB_OUTPUT
69+
cat release-plan-stderr.txt >> $GITHUB_OUTPUT
70+
echo 'EOF' >> $GITHUB_OUTPUT
71+
else
72+
echo 'text<<EOF' >> $GITHUB_OUTPUT
73+
jq .description .release-plan.json -r >> $GITHUB_OUTPUT
74+
echo 'EOF' >> $GITHUB_OUTPUT
75+
rm release-plan-stderr.txt
76+
fi
77+
env:
78+
GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
79+
80+
- uses: peter-evans/create-pull-request@v6
81+
with:
82+
commit-message: "Prepare Release using 'release-plan'"
83+
labels: "internal"
84+
branch: release-preview
85+
title: Prepare Release
86+
body: |
87+
This PR is a preview of the release that [release-plan](https://github.com/embroider-build/release-plan) has prepared. To release you should just merge this PR 👍
88+
89+
-----------------------------------------
90+
91+
${{ steps.explanation.outputs.text }}

‎.github/workflows/publish.yml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# For every push to the master branch, this checks if the release-plan was
2+
# updated and if it was it will publish stable npm packages based on the
3+
# release plan
4+
5+
name: Publish Stable
6+
7+
on:
8+
workflow_dispatch:
9+
push:
10+
branches:
11+
- main
12+
- master
13+
14+
concurrency:
15+
group: publish-${{ github.head_ref || github.ref }}
16+
cancel-in-progress: true
17+
18+
jobs:
19+
check-plan:
20+
name: "Check Release Plan"
21+
runs-on: ubuntu-latest
22+
outputs:
23+
command: ${{ steps.check-release.outputs.command }}
24+
25+
steps:
26+
- uses: actions/checkout@v4
27+
with:
28+
fetch-depth: 0
29+
ref: 'master'
30+
# This will only cause the `check-plan` job to have a result of `success`
31+
# when the .release-plan.json file was changed on the last commit. This
32+
# plus the fact that this action only runs on main will be enough of a guard
33+
- id: check-release
34+
run: if git diff --name-only HEAD HEAD~1 | grep -w -q ".release-plan.json"; then echo "command=release"; fi >> $GITHUB_OUTPUT
35+
36+
publish:
37+
name: "NPM Publish"
38+
runs-on: ubuntu-latest
39+
needs: check-plan
40+
if: needs.check-plan.outputs.command == 'release'
41+
permissions:
42+
contents: write
43+
pull-requests: write
44+
45+
steps:
46+
- uses: actions/checkout@v4
47+
- uses: actions/setup-node@v4
48+
with:
49+
node-version: 18
50+
# This creates an .npmrc that reads the NODE_AUTH_TOKEN environment variable
51+
registry-url: 'https://registry.npmjs.org'
52+
53+
- run: npm ci
54+
- name: npm publish
55+
run: npx release-plan publish
56+
57+
env:
58+
GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
59+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

‎.percy.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
version: 2
2+
snapshot:
3+
widths:
4+
- 375
5+
- 1500
6+
minHeight: 1024
7+
percyCSS: ""
8+
enableJavaScript: false
9+
cliEnableJavaScript: true
10+
disableShadowDOM: false
11+
discovery:
12+
allowedHostnames: []
13+
disallowedHostnames: []
14+
networkIdleTimeout: 100
15+
captureMockedServiceWorker: false
16+
upload:
17+
files: "**/*.{png,jpg,jpeg}"
18+
ignore: ""
19+
stripExtensions: false

‎.release-plan.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"solution": {
3+
"ember-styleguide": {
4+
"impact": "patch",
5+
"oldVersion": "11.0.2",
6+
"newVersion": "11.0.3",
7+
"constraints": [
8+
{
9+
"impact": "patch",
10+
"reason": "Appears in changelog section :bug: Bug Fix"
11+
}
12+
],
13+
"pkgJSONPath": "./package.json"
14+
}
15+
},
16+
"description": "## Release (2024-07-18)\n\nember-styleguide 11.0.3 (patch)\n\n#### :bug: Bug Fix\n* `ember-styleguide`\n * [#516](https://github.com/ember-learn/ember-styleguide/pull/516) use more standard postcss process ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n"
17+
}

‎.stylelintrc.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ module.exports = {
1212
'color-hex-length': 'long',
1313
// Disallow ids
1414
'selector-max-id': 0,
15-
// Enforce alphabetical ordering of properties
16-
'order/properties-alphabetical-order': true,
1715
// Require that color, background-color, etc use variables for colors, instead of direct values
1816
'scale-unlimited/declaration-strict-value': [
1917
['/color/'] // We can enforce variables for font-size, margin, etc as well by adding here

0 commit comments

Comments
 (0)