Skip to content

Commit

Permalink
Merge branch 'master' into addon-contributing
Browse files Browse the repository at this point in the history
  • Loading branch information
ef4 committed Sep 29, 2023
2 parents 4e6b79a + af56698 commit 2162c1a
Show file tree
Hide file tree
Showing 488 changed files with 7,763 additions and 9,048 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
/coverage/
/docs/build/
/node_modules/
/tests/fixtures/
/tmp/
tests/fixtures/

/lib/broccoli/app-*.js
/lib/broccoli/test-support-*.js
Expand Down
4 changes: 2 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ module.exports = {
parserOptions: {
ecmaVersion: 2020,
},
plugins: ['node', 'prettier'],
extends: ['eslint:recommended', 'plugin:node/recommended', 'plugin:prettier/recommended'],
plugins: ['prettier'],
extends: ['eslint:recommended', 'plugin:n/recommended', 'plugin:prettier/recommended'],
env: {
browser: false,
node: true,
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ on:
- 'release-*'
- 'lts-*'
pull_request:
workflow_dispatch:
merge_group:
schedule:
- cron: '0 3 * * *' # daily, at 3am

Expand All @@ -27,7 +29,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 14.x
node-version: 16
cache: 'yarn'

- run: yarn install --frozen-lockfile --non-interactive
Expand All @@ -45,7 +47,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 14.x
node-version: 16
cache: 'yarn'

- run: yarn install --frozen-lockfile --non-interactive
Expand All @@ -60,7 +62,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [14.x, 16.x]
node-version: [16, 18, 20]
os: [ubuntu, windows]

steps:
Expand All @@ -84,15 +86,14 @@ jobs:
matrix:
feature-flag:
- ENABLE_ALL_EXPERIMENTS
- PACKAGER
- EMBROIDER
- CLASSIC

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 14.x
node-version: 16
cache: 'yarn'

- run: yarn install --frozen-lockfile --non-interactive
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 14.x
node-version: 16

- run: yarn install --frozen-lockfile --non-interactive

- name: Test && Report to Code Climate
uses: paambaati/codeclimate-action@v3.0.0
uses: paambaati/codeclimate-action@v5.0.0
env:
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
with:
coverageCommand: yarn test:cover
coverageLocations: "coverage/lcov.info:lcov"

- name: Coveralls
uses: coverallsapp/github-action@master
uses: coverallsapp/github-action@v1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
128 changes: 128 additions & 0 deletions .github/workflows/sync-output-repos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
# This Workflow requires a GITHUB_AUTH token that can push to the editor output repos
# - https://github.com/ember-cli/ember-addon-output
# - https://github.com/ember-cli/ember-new-output
# - https://github.com/ember-cli/editor-output
#
# NOTE:
# ember-addon-output and ember-new-output have tags for each release, as well as branches
# for each lts, master (beta), and stable (release)
#
# editor-output has a branch per-editor / scenario.
# so branches form the pattern ${service}-{addon|app}-output{-typescript ?}
name: Sync Output Repos

on:
# Manual run
workflow_dispatch:
inputs:
version:
required: true
type: string
description: 'Specify the released version of ember-cli to use to generate / update the output repos. Should be full semver version, and without a leading "v"'
# https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#running-your-workflow-only-when-a-push-of-specific-tags-occurs
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onpushbranchestagsbranches-ignoretags-ignore
push:
# for addon and new output
tags:
- 'v*'

# https://docs.github.com/en/actions/learn-github-actions/variables#default-environment-variables
# https://docs.github.com/en/actions/learn-github-actions/contexts#github-context
#
# GITHUB_REF - github.ref - refs/tags/<tag-name>
# GITHUB_REF_NAME - github.ref_name - <tag-name>
# GITHUB_REF_TYPE - github.ref_type - branch or tag

env:
GIT_NAME: 'github-actions[bot]'
GIT_EMAIL: 'github-actions+bot@users.noreply.github.com'

jobs:
verify-inputs:
name: "Verify Inputs"
runs-on: ubuntu-latest
outputs:
version: ${{ steps.determine.outputs.version }}
tag: ${{ steps.determine.outputs.tag }}

steps:
- id: determine
run: |
if [[ "${{ github.event.inputs.version }}" != "" ]]; then
TAG="v${{ github.event.inputs.version }}"
VERSION="${{ github.event.inputs.version }}"
elif [[ "${{ github.ref_name }}" != "" ]]; then
TAG="${{github.ref_name}}"
_version="${{github.ref_name}}"
VERSION="${_version/v/''}"
else
echo "Could not determine tag / version"
echo ""
echo "github.ref_name = ${{ github.ref_name }}"
echo "event.inputs.version = ${{ github.event.inputs.version }}"
exit 1;
fi
if [[ "$VERSION" == v* ]]; then
echo "version, $VERSION, may not start with a 'v' character"
exit 1;
fi
echo "tag=$TAG" >> "$GITHUB_OUTPUT"
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
push-addon-app:
name: "Push to ${{ matrix.blueprint }} output repo"
runs-on: ubuntu-latest
needs: [verify-inputs]
strategy:
fail-fast: false
matrix:
blueprint: ["addon", "app"]

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18.x
cache: 'yarn'

- run: yarn install --frozen-lockfile --non-interactive
- name: "Configure Git"
run: |
git config --global user.name "${{ env.GIT_NAME }}"
git config --global user.email "${{ env.GIT_EMAIL }}"
- run: node ./dev/update-output-repos.js ${{ needs.verify-inputs.outputs.version }}
env:
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
BLUEPRINT: ${{ matrix.blueprint }}

push-editors:
name: "Push to editor output repos (${{ matrix.variant }})"
runs-on: ubuntu-latest
needs: [verify-inputs]
strategy:
fail-fast: false
matrix:
variant: ["javascript", "typescript"]


steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18.x
cache: 'yarn'

- run: yarn install --frozen-lockfile --non-interactive
- name: "Configure Git"
run: |
git config --global user.name "${{ env.GIT_NAME }}"
git config --global user.email "${{ env.GIT_EMAIL }}"
- name: Publish ${{ matrix.variant }} branches
run: node ./dev/update-editor-output-repos.js ${{ needs.verify-inputs.outputs.version }}
env:
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
VARIANT: ${{ matrix.variant }}
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
/docs/build/
/node_modules/
/tmp/
/.deps-tmp/
*.log
*.tgz
*.pem
Expand Down
12 changes: 1 addition & 11 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/.github/
/assets/
/dev/
/docs/*
Expand All @@ -12,14 +13,3 @@
/.*
*.log
/yarn.lock

# the GitHub Action CI configuration is used by
# lib/utilities/platform-checker.js to determine what versions of Node are
# under test by the current version of ember-cli being used, this means we
# **must** publish this file (but it would be ignored by the `/.*` line just
# above)
/.github/*
/.github/*/
/.github/workflows/*
/.github/workflows/*/
!/.github/workflows/ci.yml

0 comments on commit 2162c1a

Please sign in to comment.