Skip to content

Commit 25b0b99

Browse files
fabmizfabmiz
committed
Merge branch 'release/21.1.0'
2 parents 0bface3 + eea6b16 commit 25b0b99

File tree

186 files changed

+5873
-1442
lines changed

Some content is hidden

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

186 files changed

+5873
-1442
lines changed

‎.github/workflows/CI.yml‎

Lines changed: 215 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,215 @@
1+
name: CI
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- develop
8+
- master
9+
- 'release/*'
10+
- 'hotfix/*'
11+
env:
12+
PERCY_PARALLEL_NONCE: ${{ github.run_id }}-${{ github.run_number }}
13+
PERCY_PARALLEL_TOTAL: 4
14+
15+
jobs:
16+
fetch-dependencies:
17+
runs-on: ubuntu-latest
18+
if: "!contains(github.event.head_commit.message, 'skip ci')"
19+
steps:
20+
- uses: actions/checkout@v2
21+
- uses: volta-cli/action@v1
22+
- id: cache-node-modules
23+
uses: actions/cache@v2
24+
with:
25+
path: ./node_modules
26+
key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
27+
restore-keys: cached_node_modules_
28+
- if: steps.cache-node-modules.outputs.cache-hit != 'true'
29+
run: yarn --prefer-offline --frozen-lockfile --ignore-engines
30+
31+
build:
32+
runs-on: ubuntu-latest
33+
needs: fetch-dependencies
34+
steps:
35+
- uses: actions/checkout@v2
36+
- uses: volta-cli/action@v1
37+
- id: cache-node-modules
38+
uses: actions/cache@v2
39+
with:
40+
path: ./node_modules
41+
key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
42+
restore-keys: cached_node_modules_
43+
- run: yarn build:test
44+
- uses: actions/upload-artifact@v2
45+
with:
46+
name: dist
47+
path: ./dist
48+
49+
lint:
50+
runs-on: ubuntu-latest
51+
needs: fetch-dependencies
52+
steps:
53+
- uses: actions/checkout@v2
54+
- id: cache-node-modules
55+
uses: actions/cache@v2
56+
with:
57+
path: ./node_modules
58+
key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
59+
restore-keys: cached_node_modules_
60+
- run: yarn lint:es
61+
- run: yarn lint:ts
62+
- run: yarn lint:style
63+
- run: yarn lint:template
64+
65+
test-partition-1:
66+
runs-on: ubuntu-latest
67+
needs: build
68+
steps:
69+
- uses: actions/checkout@v2
70+
- uses: volta-cli/action@v1
71+
- uses: actions/download-artifact@v2
72+
with:
73+
name: dist
74+
path: ./dist
75+
- id: cache-node-modules
76+
uses: actions/cache@v2
77+
with:
78+
path: ./node_modules
79+
key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
80+
restore-keys: cached_node_modules_
81+
- uses: percy/[email protected]
82+
with:
83+
custom-command: yarn test --path ./dist --partition 1
84+
env:
85+
PERCY_PARALLEL_NONCE: ${{ env.PERCY_PARALLEL_NONCE }}
86+
PERCY_PARALLEL_TOTAL: ${{ env.PERCY_PARALLEL_TOTAL }}
87+
PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
88+
timeout-minutes: 10
89+
90+
test-partition-2:
91+
runs-on: ubuntu-latest
92+
needs: build
93+
steps:
94+
- uses: actions/checkout@v2
95+
- uses: volta-cli/action@v1
96+
- uses: actions/download-artifact@v2
97+
with:
98+
name: dist
99+
path: ./dist
100+
- id: cache-node-modules
101+
uses: actions/cache@v2
102+
with:
103+
path: ./node_modules
104+
key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
105+
restore-keys: cached_node_modules_
106+
- uses: percy/[email protected]
107+
with:
108+
custom-command: yarn test --path ./dist --partition 2
109+
env:
110+
PERCY_PARALLEL_NONCE: ${{ env.PERCY_PARALLEL_NONCE }}
111+
PERCY_PARALLEL_TOTAL: ${{ env.PERCY_PARALLEL_TOTAL }}
112+
PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
113+
timeout-minutes: 10
114+
115+
test-partition-3:
116+
runs-on: ubuntu-latest
117+
needs: build
118+
steps:
119+
- uses: actions/checkout@v2
120+
- uses: volta-cli/action@v1
121+
- uses: actions/download-artifact@v2
122+
with:
123+
name: dist
124+
path: ./dist
125+
- id: cache-node-modules
126+
uses: actions/cache@v2
127+
with:
128+
path: ./node_modules
129+
key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
130+
restore-keys: cached_node_modules_
131+
- uses: percy/[email protected]
132+
with:
133+
custom-command: yarn test --path ./dist --partition 3
134+
env:
135+
PERCY_PARALLEL_NONCE: ${{ env.PERCY_PARALLEL_NONCE }}
136+
PERCY_PARALLEL_TOTAL: ${{ env.PERCY_PARALLEL_TOTAL }}
137+
PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
138+
timeout-minutes: 10
139+
140+
test-partition-4:
141+
runs-on: ubuntu-latest
142+
needs: build
143+
steps:
144+
- uses: actions/checkout@v2
145+
- uses: volta-cli/action@v1
146+
- uses: actions/download-artifact@v2
147+
with:
148+
name: dist
149+
path: ./dist
150+
- id: cache-node-modules
151+
uses: actions/cache@v2
152+
with:
153+
path: ./node_modules
154+
key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
155+
restore-keys: cached_node_modules_
156+
- uses: percy/[email protected]
157+
with:
158+
custom-command: yarn test --path ./dist --partition 4
159+
env:
160+
PERCY_PARALLEL_NONCE: ${{ env.PERCY_PARALLEL_NONCE }}
161+
PERCY_PARALLEL_TOTAL: ${{ env.PERCY_PARALLEL_TOTAL }}
162+
PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
163+
timeout-minutes: 10
164+
165+
# Coverage disabled while these are worked out:
166+
# https://github.com/babel/ember-cli-babel/issues/350
167+
# https://github.com/ember-cli/babel-plugin-ember-modules-api-polyfill/issues/112
168+
# test-with-coverage:
169+
# runs-on: ubuntu-latest
170+
# timeout-minutes: 10
171+
# needs: build
172+
# steps:
173+
# - uses: actions/checkout@v2
174+
# - uses: volta-cli/action@v1
175+
# - uses: actions/download-artifact@v2
176+
# with:
177+
# name: dist
178+
# path: ./dist
179+
# - id: cache-node-modules
180+
# uses: actions/cache@v2
181+
# with:
182+
# path: ./node_modules
183+
# key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
184+
# restore-keys: cached_node_modules_
185+
# - run: yarn test:cover --path ./dist
186+
# - name: Save code coverage artifact
187+
# uses: actions/upload-artifact@v2
188+
# with:
189+
# name: coverage-info
190+
# path: ./coverage/lcov.info
191+
#
192+
# send-coverage:
193+
# runs-on: ubuntu-latest
194+
# timeout-minutes: 10
195+
# needs: test
196+
# steps:
197+
# - uses: volta-cli/action@v1
198+
# - uses: actions/download-artifact@v2
199+
# with:
200+
# name: coverage-info
201+
# path: ./lcov.info
202+
# - uses: actions/cache@v2
203+
# with:
204+
# path: ./node_modules
205+
# key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
206+
# restore-keys: cached_node_modules_
207+
# - name: Generate coverage report
208+
# env:
209+
# COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
210+
# run: yarn coveralls
211+
#
212+
# - name: Send coverage report to coveralls
213+
# uses: coverallsapp/github-action@master
214+
# with:
215+
# github-token: ${{ secrets.GITHUB_TOKEN }}

‎.travis.yml‎

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

‎CHANGELOG.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7+
## [21.1.0] - 2021-03-30
8+
### Added
9+
- no-project registrations
10+
711
## [20.13.0] - 2020-12-17
812
### Added
913
- moderation tests
@@ -1688,7 +1692,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
16881692
### Added
16891693
- Quick Files
16901694

1691-
[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/20.13.0...develop
1695+
[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/21.1.0...develop
1696+
[21.1.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.1.0
16921697
[20.13.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.13.0
16931698
[20.12.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.12.1
16941699
[20.12.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.12.0

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### App code
2-
FROM quay.io/centerforopenscience/ember-base AS app
2+
FROM quay.io/centerforopenscience/ember-base-10 AS app
33

44
COPY ./package.json ./yarn.lock ./.yarnrc ./
55
RUN yarn --frozen-lockfile

‎README.md‎

Lines changed: 13 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
# ember-osf-web
22

3-
[![Greenkeeper badge](https://badges.greenkeeper.io/CenterForOpenScience/ember-osf-web.svg)](https://greenkeeper.io/)
4-
5-
`master` Build Status: [![Build Status](https://travis-ci.org/CenterForOpenScience/ember-osf-web.svg?branch=master)](https://travis-ci.org/CenterForOpenScience/ember-osf-web)
6-
[![Coverage Status](https://coveralls.io/repos/github/CenterForOpenScience/ember-osf-web/badge.svg?branch=master)](https://coveralls.io/github/CenterForOpenScience/ember-osf-web?branch=master)
7-
8-
`develop` Build Status: [![Build Status](https://travis-ci.org/CenterForOpenScience/ember-osf-web.svg?branch=develop)](https://travis-ci.org/CenterForOpenScience/ember-osf-web)
9-
[![Coverage Status](https://coveralls.io/repos/github/CenterForOpenScience/ember-osf-web/badge.svg?branch=develop)](https://coveralls.io/github/CenterForOpenScience/ember-osf-web?branch=develop)
3+
`master build`<a href="https://github.com/CenterForOpenScience/ember-osf-web/actions">
4+
<img alt="master build status" style="margin-bottom: -4px" src="https://github.com/CenterForOpenScience/ember-osf-web/workflows/CI/badge.svg?branch=master">
5+
</a>
6+
<a href="https://coveralls.io/github/CenterForOpenScience/ember-osf-web?branch=master">
7+
<img alt="Coverage Status" style="margin-bottom: -4px;" src="https://coveralls.io/repos/github/CenterForOpenScience/ember-osf-web/badge.svg?branch=master">
8+
</a>
9+
10+
`develop build`<a href="https://github.com/CenterForOpenScience/ember-osf-web/actions">
11+
<img alt="develop build status" style="margin-bottom: -4px;" src="https://github.com/CenterForOpenScience/ember-osf-web/workflows/CI/badge.svg?branch=develop">
12+
</a>
13+
<a href="https://coveralls.io/github/CenterForOpenScience/ember-osf-web?branch=master">
14+
<img alt="Coverage Status" style="margin-bottom: -4px;" src="https://coveralls.io/repos/github/CenterForOpenScience/ember-osf-web/badge.svg?branch=develop">
15+
</a>
1016

1117
A front end for [osf.io](https://github.com/CenterForOpenScience/osf.io).
1218

@@ -72,43 +78,6 @@ To integrate with the legacy front end at [localhost:5000](http://localhost:5000
7278
# ...
7379
```
7480

75-
### Developer Handbook
76-
77-
To enable the [developer handbook](https://centerforopenscience.github.io/ember-osf-web/handbook) locally,
78-
add the following to your `config/local.js`:
79-
```ts
80-
module.exports = {
81-
HANDBOOK_ENABLED: true,
82-
};
83-
```
84-
The handbook will be available at [http://localhost:4200/handbook](http://localhost:4200/handbook).
85-
86-
To enable (experimental) auto-generated docs in the handbook, you can also set
87-
`HANDBOOK_DOC_GENERATION_ENABLED: true` in your local config.
88-
89-
#### Enable handbook on your fork
90-
91-
1. [Generate a deploy key](https://developer.github.com/v3/guides/managing-deploy-keys/)
92-
* `ssh-keygen -t rsa -b 4096 -C <your@email.com>`
93-
* Enter file in which to save the key (~/.ssh/id_rsa): `~/deploy_key`
94-
* Press enter twice for no passphrase
95-
2. Add the public key in your GitHub repository settings
96-
* `cat ~/deploy_key.pub | pbcopy`
97-
* Go to `https://github.com/<org>/<repo>/settings/keys/new`
98-
* Title: `Travis CI`
99-
* Key: paste in the public key
100-
* ☑️ Allow write access
101-
3. Add the base64-encoded private key to Travis CI
102-
* `cat ~/deploy_key | base64 | pbcopy`
103-
* Go to `https://travis-ci.org/<org>/<repo>/settings`
104-
* Under Environment Variables, add
105-
* Name: `DEPLOY_KEY`
106-
* Value: paste in the private key
107-
* 'Leave Display Value in Build log' off
108-
* Click Add
109-
4. Delete the keypair
110-
* `rm ~/deploy_key ~/deploy_key.pub`
111-
11281
### Code Generators
11382

11483
Make use of the many generators for code, try `ember help generate` for more details

0 commit comments

Comments
 (0)