Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update broccoli-favicon and support embroider #102

Merged
merged 9 commits into from
Oct 7, 2021
Merged

update broccoli-favicon and support embroider #102

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
45f807b
update broccoli-favicon
miguelcobain Sep 22, 2021
502b5ed
update ember-cli project
miguelcobain Sep 22, 2021
84eb8a4
fix CI
miguelcobain Sep 23, 2021
d8076d7
use contentFor instead of postprocessTree
miguelcobain Sep 23, 2021
5dc0216
fix test running script
miguelcobain Sep 23, 2021
86c24e6
fix ember:test command
miguelcobain Sep 23, 2021
7c18582
update package lock
miguelcobain Sep 23, 2021
355abbf
remove ember-cli-release
miguelcobain Sep 23, 2021
318c841
add command
miguelcobain Sep 23, 2021
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
Prev Previous commit
Next Next commit
fix CI
  • Loading branch information
@miguelcobain
miguelcobain committed Sep 23, 2021
commit 84eb8a4e64bc4499f2fa0ab0d55c86c8d3527995
136 changes: 66 additions & 70 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
pull_request:

env:
NODE_VERSION: 10
NODE_VERSION: 12

jobs:
lint:
Expand All @@ -22,9 +22,6 @@ jobs:
with:
node-version: '${{ env.NODE_VERSION }}'

- name: Install latest npm
run: npm install -g npm@latest

- name: Get package manager's global cache path
id: global-cache-dir-path
run: echo "::set-output name=dir::$(npm config get cache)"
Expand All @@ -36,21 +33,25 @@ jobs:
path: |
${{ steps.global-cache-dir-path.outputs.dir }}
node_modules
key: ${{ runner.os }}-${{ env.NODE_VERSION }}-${{hashFiles('**/package-lock.json')}}
key: ${{ runner.os }}-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-${{ env.NODE_VERSION }}-

${{ runner.os }}-${{ matrix.node-version }}-
- name: Install Dependencies
run: npm ci
if: |
steps.cache-dependencies.outputs.cache-hit != 'true'

- name: Lint
run: npm run lint
run: npm run-script lint

test:
name: Tests
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
needs: lint

strategy:
matrix:
os: [ubuntu-latest]
browser: [chrome]

steps:
- uses: actions/checkout@v2
Expand All @@ -61,9 +62,6 @@ jobs:
with:
node-version: '${{ env.NODE_VERSION }}'

- name: Install latest npm
run: npm install -g npm@latest

- name: Get package manager's global cache path
id: global-cache-dir-path
run: echo "::set-output name=dir::$(npm config get cache)"
Expand All @@ -75,22 +73,25 @@ jobs:
path: |
${{ steps.global-cache-dir-path.outputs.dir }}
node_modules
key: ${{ runner.os }}-${{ env.NODE_VERSION }}-${{hashFiles('**/package-lock.json')}}
key: ${{ runner.os }}-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-${{ env.NODE_VERSION }}-

${{ runner.os }}-${{ matrix.node-version }}-
- name: Install Dependencies
run: npm ci
if: |
steps.cache-dependencies.outputs.cache-hit != 'true'

- name: Test
run: npm run test
run: npm run-script test:ember --launch ${{ matrix.browser }}

floating-dependencies:
name: Floating Dependencies
runs-on: ubuntu-latest
needs: test
runs-on: ${{ matrix.os }}
needs: lint

strategy:
matrix:
os: [ubuntu-latest]
browser: [chrome]

steps:
- uses: actions/checkout@v2
Expand All @@ -101,9 +102,6 @@ jobs:
with:
node-version: '${{ env.NODE_VERSION }}'

- name: Install latest npm
run: npm install -g npm@latest

- name: Get package manager's global cache path
id: global-cache-dir-path
run: echo "::set-output name=dir::$(npm config get cache)"
Expand All @@ -115,15 +113,14 @@ jobs:
path: |
${{ steps.global-cache-dir-path.outputs.dir }}
node_modules
key: ${{ runner.os }}-${{ env.NODE_VERSION }}-${{hashFiles('**/package-lock.json')}}
key: ${{ runner.os }}-${{ matrix.node-version }}-floating-deps
restore-keys: |
${{ runner.os }}-${{ env.NODE_VERSION }}-

${{ runner.os }}-${{ matrix.node-version }}-
- name: Install Dependencies
run: npm install --no-package-lock

- name: Test
run: npm run test
run: npm run-script test:ember --launch ${{ matrix.browser }}

try-scenarios:
name: Tests - ${{ matrix.ember-try-scenario }}
Expand All @@ -132,53 +129,52 @@ jobs:
needs: test

strategy:
fail-fast: false
fail-fast: true
matrix:
ember-try-scenario:
- ember-lts-3.16
- ember-lts-3.20
- ember-release
- ember-default-with-jquery
- ember-classic
- ember-beta
ember-try-scenario: [
ember-lts-3.20,
ember-lts-3.24,
ember-release,
ember-beta,
ember-canary,
ember-default-with-jquery,
ember-classic,
embroider-safe
embroider-optimized,
]
allow-failure: [false]
include:
- ember-try-scenario: ember-canary
allow-failure: true

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 1

- uses: actions/setup-node@v2
with:
node-version: '${{ env.NODE_VERSION }}'

- name: Install latest npm
run: npm install -g npm@latest

- name: Get package manager's global cache path
id: global-cache-dir-path
run: echo "::set-output name=dir::$(pm config get cache)"

- name: Cache package manager's global cache and node_modules
id: cache-dependencies
uses: actions/cache@v2
with:
path: |
${{ steps.global-cache-dir-path.outputs.dir }}
node_modules
key: ${{ runner.os }}-${{ env.NODE_VERSION }}-${{hashFiles('**/package-lock.json')}}
restore-keys: |
${{ runner.os }}-${{ env.NODE_VERSION }}-

- name: Install Dependencies
run: npm ci
if: |
steps.cache-dependencies.outputs.cache-hit != 'true'

- name: Test
env:
EMBER_TRY_SCENARIO: ${{ matrix.ember-try-scenario }}
run: node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --- npm test
- uses: actions/checkout@v2
with:
fetch-depth: 1

- uses: actions/setup-node@v2
with:
node-version: '${{ env.NODE_VERSION }}'

- name: Get package manager's global cache path
id: global-cache-dir-path
run: echo "::set-output name=dir::$(npm config get cache)"

- name: Cache package manager's global cache and node_modules
id: cache-dependencies
uses: actions/cache@v2
with:
path: |
${{ steps.global-cache-dir-path.outputs.dir }}
node_modules
key: ${{ runner.os }}-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-${{ matrix.node-version }}-
- name: Install Dependencies
run: npm ci
if: |
steps.cache-dependencies.outputs.cache-hit != 'true'
- name: Test
env:
EMBER_TRY_SCENARIO: ${{ matrix.ember-try-scenario }}
run: node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO