Skip to content

Commit 875fecd

Browse files
dfreemandfreeman
authored
Merge branch 'master' into blueprint-style
2 parents 4183a3a + cb6b1df commit 875fecd

File tree

11 files changed

+1438
-1262
lines changed

11 files changed

+1438
-1262
lines changed

‎.azure/ci-template.yml‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎.github/workflows/ci.yml‎

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
name: CI
2+
3+
# These trigger patterns based on https://github.com/broccolijs/broccoli/pull/436
4+
on:
5+
pull_request:
6+
push:
7+
# filtering branches here prevents duplicate builds from pull_request and push
8+
branches:
9+
- master
10+
- 'v*'
11+
# always run CI for tags
12+
tags:
13+
- '*'
14+
15+
# early issue detection: run CI weekly on Sundays
16+
schedule:
17+
- cron: '0 6 * * 0'
18+
19+
env:
20+
CI: true
21+
22+
jobs:
23+
commitlint:
24+
name: Lint Commits
25+
runs-on: ubuntu-latest
26+
env:
27+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
28+
steps:
29+
- name: Checkout Code
30+
uses: actions/checkout@v1
31+
- name: Commitlint
32+
uses: wagoid/commitlint-github-action@v1.2.2
33+
34+
test-locked-deps:
35+
name: Test (linux, locked dependencies)
36+
runs-on: ubuntu-latest
37+
steps:
38+
- name: Checkout Code
39+
uses: actions/checkout@v1
40+
- name: Install Node
41+
uses: actions/setup-node@v1
42+
with:
43+
node-version: '^8.12'
44+
# https://github.com/expo/expo-github-action/issues/20#issuecomment-541676895
45+
- name: Raise Watched File Limit
46+
run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
47+
- name: Install Dependencies
48+
run: yarn install --frozen-lockfile
49+
- name: Lint JS/TS Code
50+
run: yarn lint:js
51+
- name: Prepare CI Environment
52+
run: yarn ci:prepare
53+
- name: Ember App Tests
54+
run: yarn ci:test:app
55+
- name: Node Tests
56+
run: yarn ci:test:node
57+
58+
test-windows:
59+
name: Test (windows, locked dependencies)
60+
runs-on: windows-latest
61+
steps:
62+
- name: Checkout Code
63+
uses: actions/checkout@v1
64+
- name: Install Node
65+
uses: actions/setup-node@v1
66+
with:
67+
node-version: '^8.12'
68+
- name: Install Dependencies
69+
run: yarn install --frozen-lockfile
70+
- name: Prepare CI Environment
71+
run: yarn ci:prepare
72+
- name: Ember App Tests
73+
run: yarn ci:test:app
74+
- name: Node Tests
75+
run: yarn ci:test:node
76+
77+
test-floating:
78+
name: Test (linux, floating dependencies)
79+
runs-on: ubuntu-latest
80+
needs: [test-locked-deps]
81+
steps:
82+
- name: Checkout Code
83+
uses: actions/checkout@v1
84+
- name: Install Node
85+
uses: actions/setup-node@v1
86+
with:
87+
node-version: '^8.12'
88+
- name: Raise Watched File Limit
89+
run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
90+
- name: Install Dependencies
91+
run: yarn install --no-lockfile
92+
- name: Prepare CI Environment
93+
run: yarn ci:prepare
94+
- name: Ember App Tests
95+
run: yarn ci:test:app
96+
- name: Node Tests
97+
run: yarn ci:test:node
98+
99+
test-ts-cli-matrix:
100+
name: Test
101+
runs-on: ubuntu-latest
102+
needs: [test-locked-deps]
103+
strategy:
104+
matrix:
105+
deps:
106+
- ember-cli@latest
107+
- ember-cli@beta
108+
- typescript@latest
109+
- typescript@next
110+
steps:
111+
- name: Checkout Code
112+
uses: actions/checkout@v1
113+
- name: Install Node
114+
uses: actions/setup-node@v1
115+
with:
116+
node-version: '^8.12'
117+
- name: Raise Watched File Limit
118+
run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
119+
- name: Install Dependencies
120+
run: yarn add --dev ${{ matrix.deps }}
121+
- name: Prepare CI Environment
122+
run: yarn ci:prepare
123+
- name: Ember App Tests
124+
run: yarn ci:test:app
125+
- name: Node Tests
126+
run: yarn ci:test:node
127+

‎CHANGELOG.md‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,26 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
66

77
## [Unreleased]
88

9+
### Under the hood 🚗
10+
11+
- Switch from Azure Pipelines to GitHub Actions. Hopefully our Windows builds will be much more stable now! 🤞
12+
13+
## [3.1.1] - 2019-11-06
14+
15+
### Added ⭐️
16+
17+
- Adds appropriate Babel plugins to support the [nullish coalescing][nullish-coalescing] and [optional chaining][optional-chaining] proposals, both supported in TypeScript [starting with 3.7][ts-3.7]. ([#914], [#936])
18+
19+
[nullish-coalescing]: https://github.com/tc39/proposal-nullish-coalescing
20+
[optional-chaining]: https://github.com/tc39/proposal-optional-chaining
21+
[ts-3.7]: https://devblogs.microsoft.com/typescript/announcing-typescript-3-7/
22+
[#914]: https://github.com/typed-ember/ember-cli-typescript/pull/914
23+
[#936]: https://github.com/typed-ember/ember-cli-typescript/pull/936
24+
25+
## 3.1.0 - 2019-11-06
26+
27+
3.1.0 was a bad release on npm, and was yanked accordingly. See **3.1.1**!
28+
929
## [3.0.0] - 2019-08-30
1030

1131
### Added ⭐️
@@ -563,7 +583,12 @@ We now use Babel 7's support for TypeScript to build apps and addons. Most of th
563583
* Basic, semi-working functionality.
564584

565585
[ember-cli-typify]: https://github.com/winding-lines/ember-cli-typify
566-
[unreleased]: https://github.com/typed-ember/ember-cli-typescript/compare/v3.0.0...HEAD
586+
[unreleased]: https://github.com/typed-ember/ember-cli-typescript/compare/v3.1.1...HEAD
587+
<!--
588+
Note that 3.1.1 *intentionally* includes all the changes between 3.0.0 and
589+
3.1.1 and there is no entry for 3.1.0. This is because 3.1.0 was yanked.
590+
-->
591+
[3.1.1]: https://github.com/typed-ember/ember-cli-typescript/compare/v3.0.0...v3.1.1
567592
[3.0.0]: https://github.com/typed-ember/ember-cli-typescript/compare/v2.0.2...v3.0.0
568593
[2.0.2]: https://github.com/typed-ember/ember-cli-typescript/compare/v2.0.1...v2.0.2
569594
[2.0.1]: https://github.com/typed-ember/ember-cli-typescript/compare/v2.0.0...v2.0.1

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<center>
66

7-
[![Build Status](https://dev.azure.com/typed-ember/ember-cli-typescript/_apis/build/status/typed-ember.ember-cli-typescript)](https://dev.azure.com/typed-ember/ember-cli-typescript/_build/latest?definitionId=2) [![Ember Observer Score](https://emberobserver.com/badges/ember-cli-typescript.svg)](https://emberobserver.com/addons/ember-cli-typescript)
7+
[![Actions Status](https://github.com/typed-ember/ember-cli-typescript/workflows/CI/badge.svg)](https://github.com/typed-ember/ember-cli-typescript/actions) [![Ember Observer Score](https://emberobserver.com/badges/ember-cli-typescript.svg)](https://emberobserver.com/addons/ember-cli-typescript)
88

99
</center>
1010

‎azure-pipelines.yml‎

Lines changed: 0 additions & 85 deletions
This file was deleted.

0 commit comments

Comments
 (0)