Skip to content

Commit 98e0a1f

Browse files
FaliburFalibur
authored
Merge branch 'mike-north:master' into support-snapshot-adapteroptions
2 parents f4be757 + af84bdb commit 98e0a1f

26 files changed

+8595
-4447
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- 'v*'
8+
pull_request: {}
9+
schedule:
10+
- cron: '0 3 * * *' # daily, at 3am
11+
12+
jobs:
13+
test:
14+
name: Test
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v1
18+
- uses: volta-cli/action@v1
19+
- name: Get yarn cache directory path
20+
id: yarn-cache-dir-path
21+
run: echo "::set-output name=dir::$(yarn cache dir)"
22+
- uses: actions/cache@v1
23+
id: yarn-cache
24+
with:
25+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
26+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
27+
restore-keys: |
28+
${{ runner.os }}-yarn-
29+
- run: yarn install --frozen-lockfile
30+
- run: yarn lint:ts
31+
- run: yarn lint:hbs
32+
- run: yarn ember test
33+
34+
floating-deps:
35+
name: Floating Dependencies
36+
runs-on: ubuntu-latest
37+
steps:
38+
- uses: actions/checkout@v1
39+
- uses: volta-cli/action@v1
40+
- name: Get yarn cache directory path
41+
id: yarn-cache-dir-path
42+
run: echo "::set-output name=dir::$(yarn cache dir)"
43+
- uses: actions/cache@v1
44+
id: yarn-cache
45+
with:
46+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
47+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
48+
restore-keys: |
49+
${{ runner.os }}-yarn-
50+
- run: yarn install --no-lockfile
51+
- run: yarn ember test
52+
53+
ember-try:
54+
name: Ember Try
55+
needs: [test, floating-deps]
56+
runs-on: ubuntu-latest
57+
strategy:
58+
matrix:
59+
ember-try-scenario:
60+
- ember-lts-3.20
61+
- ember-lts-3.24
62+
- ember-release
63+
- ember-beta
64+
- ember-canary
65+
- ember-default-with-jquery
66+
steps:
67+
- uses: actions/checkout@v1
68+
- uses: volta-cli/action@v1
69+
- name: Get yarn cache directory path
70+
id: yarn-cache-dir-path
71+
run: echo "::set-output name=dir::$(yarn cache dir)"
72+
- uses: actions/cache@v1
73+
id: yarn-cache
74+
with:
75+
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
76+
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
77+
restore-keys: |
78+
${{ runner.os }}-yarn-
79+
- run: yarn install --frozen-lockfile
80+
- run: yarn ember try:one ${{ matrix.ember-try-scenario }}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# compiled output
44
/dist/
55
/tmp/
6+
*.tgz
67

78
# dependencies
89
/bower_components/

‎.husky/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
_

‎.husky/commit-msg‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
./node_modules/.bin/commitlint -e $HUSKY_GIT_PARAMS

‎.jscsrc‎

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

‎.jshintrc‎

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

‎.npmignore‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,20 @@
66
/bower_components/
77

88
# misc
9-
/.bowerrc
10-
/.editorconfig
11-
/.ember-cli
12-
/.eslintignore
13-
/.eslintrc.js
14-
/.gitignore
15-
/.template-lintrc.js
16-
/.travis.yml
17-
/.watchmanconfig
18-
/bower.json
9+
/tests/
10+
/types/
11+
/.*
1912
/config/ember-try.js
2013
/ember-cli-build.js
14+
/renovate.json
2115
/testem.js
22-
/tests/
16+
/tsconfig.json
17+
/tslint.json
2318
/yarn.lock
19+
/yarn-error.log
2420
.gitkeep
21+
*.tgz
2522

2623
# ember-try
2724
/.node_modules.ember-try/
28-
/bower.json.ember-try
2925
/package.json.ember-try

‎.travis.yml‎

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

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## [0.2.9](https://github.com/mike-north/ember-api-actions/compare/v0.2.8...v0.2.9) (2020-04-04)
2+
3+
4+
### Bug Fixes
5+
6+
* **deps:** ember-cli-typescript ([#409](https://github.com/mike-north/ember-api-actions/issues/409)) ([c493a53](https://github.com/mike-north/ember-api-actions/commit/c493a53))
7+
18
## [0.2.8](https://github.com/mike-north/ember-api-actions/compare/v0.2.7...v0.2.8) (2019-04-11)
29

310

‎README.md‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -154,16 +154,6 @@ Customizing your adapter should customize requests sent out via this library, al
154154
- [buildURL](http://emberjs.com/api/data/classes/DS.RESTAdapter.html#method_buildURL) - for generating an action's URL
155155
- [ajax](https://github.com/emberjs/data/blob/v1.13.4/packages/ember-data/lib/adapters/rest-adapter.js#L836-L859) (private) - to actually make the API request and return a promise
156156
157-
## Compatibility
158-
159-
This addon is known to work with certain combinations of ember.js and ember-data
160-
161-
| Ember.js | Ember-data |
162-
| ---------------------- | ------------------------------------------------ |
163-
| `1.10 <= ember < 1.13` | `1.0.0-beta.16.0 <= ember-data <= 1.0.0-beta.19` |
164-
| `1.13.x` | `1.13.x` |
165-
| `2.0.x` | `2.0.x` |
166-
167157
## Installation
168158
169159
- `git clone` this repository

0 commit comments

Comments
 (0)