Skip to content

Commit

Permalink
Merge branch 'release/21.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
fabmiz committed Mar 30, 2021
2 parents 0bface3 + eea6b16 commit 25b0b99
Show file tree
Hide file tree
Showing 186 changed files with 5,873 additions and 1,442 deletions.
215 changes: 215 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,215 @@
name: CI

on:
pull_request:
push:
branches:
- develop
- master
- 'release/*'
- 'hotfix/*'
env:
PERCY_PARALLEL_NONCE: ${{ github.run_id }}-${{ github.run_number }}
PERCY_PARALLEL_TOTAL: 4

jobs:
fetch-dependencies:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'skip ci')"
steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
- id: cache-node-modules
uses: actions/cache@v2
with:
path: ./node_modules
key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
restore-keys: cached_node_modules_
- if: steps.cache-node-modules.outputs.cache-hit != 'true'
run: yarn --prefer-offline --frozen-lockfile --ignore-engines

build:
runs-on: ubuntu-latest
needs: fetch-dependencies
steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
- id: cache-node-modules
uses: actions/cache@v2
with:
path: ./node_modules
key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
restore-keys: cached_node_modules_
- run: yarn build:test
- uses: actions/upload-artifact@v2
with:
name: dist
path: ./dist

lint:
runs-on: ubuntu-latest
needs: fetch-dependencies
steps:
- uses: actions/checkout@v2
- id: cache-node-modules
uses: actions/cache@v2
with:
path: ./node_modules
key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
restore-keys: cached_node_modules_
- run: yarn lint:es
- run: yarn lint:ts
- run: yarn lint:style
- run: yarn lint:template

test-partition-1:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
- uses: actions/download-artifact@v2
with:
name: dist
path: ./dist
- id: cache-node-modules
uses: actions/cache@v2
with:
path: ./node_modules
key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
restore-keys: cached_node_modules_
- uses: percy/exec-action@v0.3.1
with:
custom-command: yarn test --path ./dist --partition 1
env:
PERCY_PARALLEL_NONCE: ${{ env.PERCY_PARALLEL_NONCE }}
PERCY_PARALLEL_TOTAL: ${{ env.PERCY_PARALLEL_TOTAL }}
PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
timeout-minutes: 10

test-partition-2:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
- uses: actions/download-artifact@v2
with:
name: dist
path: ./dist
- id: cache-node-modules
uses: actions/cache@v2
with:
path: ./node_modules
key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
restore-keys: cached_node_modules_
- uses: percy/exec-action@v0.3.1
with:
custom-command: yarn test --path ./dist --partition 2
env:
PERCY_PARALLEL_NONCE: ${{ env.PERCY_PARALLEL_NONCE }}
PERCY_PARALLEL_TOTAL: ${{ env.PERCY_PARALLEL_TOTAL }}
PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
timeout-minutes: 10

test-partition-3:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
- uses: actions/download-artifact@v2
with:
name: dist
path: ./dist
- id: cache-node-modules
uses: actions/cache@v2
with:
path: ./node_modules
key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
restore-keys: cached_node_modules_
- uses: percy/exec-action@v0.3.1
with:
custom-command: yarn test --path ./dist --partition 3
env:
PERCY_PARALLEL_NONCE: ${{ env.PERCY_PARALLEL_NONCE }}
PERCY_PARALLEL_TOTAL: ${{ env.PERCY_PARALLEL_TOTAL }}
PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
timeout-minutes: 10

test-partition-4:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@v2
- uses: volta-cli/action@v1
- uses: actions/download-artifact@v2
with:
name: dist
path: ./dist
- id: cache-node-modules
uses: actions/cache@v2
with:
path: ./node_modules
key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
restore-keys: cached_node_modules_
- uses: percy/exec-action@v0.3.1
with:
custom-command: yarn test --path ./dist --partition 4
env:
PERCY_PARALLEL_NONCE: ${{ env.PERCY_PARALLEL_NONCE }}
PERCY_PARALLEL_TOTAL: ${{ env.PERCY_PARALLEL_TOTAL }}
PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
timeout-minutes: 10

# Coverage disabled while these are worked out:
# https://github.com/babel/ember-cli-babel/issues/350
# https://github.com/ember-cli/babel-plugin-ember-modules-api-polyfill/issues/112
# test-with-coverage:
# runs-on: ubuntu-latest
# timeout-minutes: 10
# needs: build
# steps:
# - uses: actions/checkout@v2
# - uses: volta-cli/action@v1
# - uses: actions/download-artifact@v2
# with:
# name: dist
# path: ./dist
# - id: cache-node-modules
# uses: actions/cache@v2
# with:
# path: ./node_modules
# key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
# restore-keys: cached_node_modules_
# - run: yarn test:cover --path ./dist
# - name: Save code coverage artifact
# uses: actions/upload-artifact@v2
# with:
# name: coverage-info
# path: ./coverage/lcov.info
#
# send-coverage:
# runs-on: ubuntu-latest
# timeout-minutes: 10
# needs: test
# steps:
# - uses: volta-cli/action@v1
# - uses: actions/download-artifact@v2
# with:
# name: coverage-info
# path: ./lcov.info
# - uses: actions/cache@v2
# with:
# path: ./node_modules
# key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
# restore-keys: cached_node_modules_
# - name: Generate coverage report
# env:
# COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
# run: yarn coveralls
#
# - name: Send coverage report to coveralls
# uses: coverallsapp/github-action@master
# with:
# github-token: ${{ secrets.GITHUB_TOKEN }}
74 changes: 0 additions & 74 deletions .travis.yml

This file was deleted.

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

## [21.1.0] - 2021-03-30
### Added
- no-project registrations

## [20.13.0] - 2020-12-17
### Added
- moderation tests
Expand Down Expand Up @@ -1688,7 +1692,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Added
- Quick Files

[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/20.13.0...develop
[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/21.1.0...develop
[21.1.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.1.0
[20.13.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.13.0
[20.12.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.12.1
[20.12.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.12.0
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### App code
FROM quay.io/centerforopenscience/ember-base AS app
FROM quay.io/centerforopenscience/ember-base-10 AS app

COPY ./package.json ./yarn.lock ./.yarnrc ./
RUN yarn --frozen-lockfile
Expand Down
57 changes: 13 additions & 44 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
# ember-osf-web

[![Greenkeeper badge](https://badges.greenkeeper.io/CenterForOpenScience/ember-osf-web.svg)](https://greenkeeper.io/)

`master` Build Status: [![Build Status](https://travis-ci.org/CenterForOpenScience/ember-osf-web.svg?branch=master)](https://travis-ci.org/CenterForOpenScience/ember-osf-web)
[![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)

`develop` Build Status: [![Build Status](https://travis-ci.org/CenterForOpenScience/ember-osf-web.svg?branch=develop)](https://travis-ci.org/CenterForOpenScience/ember-osf-web)
[![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)
`master build`<a href="https://github.com/CenterForOpenScience/ember-osf-web/actions">
<img alt="master build status" style="margin-bottom: -4px" src="https://github.com/CenterForOpenScience/ember-osf-web/workflows/CI/badge.svg?branch=master">
</a>
<a href="https://coveralls.io/github/CenterForOpenScience/ember-osf-web?branch=master">
<img alt="Coverage Status" style="margin-bottom: -4px;" src="https://coveralls.io/repos/github/CenterForOpenScience/ember-osf-web/badge.svg?branch=master">
</a>

`develop build`<a href="https://github.com/CenterForOpenScience/ember-osf-web/actions">
<img alt="develop build status" style="margin-bottom: -4px;" src="https://github.com/CenterForOpenScience/ember-osf-web/workflows/CI/badge.svg?branch=develop">
</a>
<a href="https://coveralls.io/github/CenterForOpenScience/ember-osf-web?branch=master">
<img alt="Coverage Status" style="margin-bottom: -4px;" src="https://coveralls.io/repos/github/CenterForOpenScience/ember-osf-web/badge.svg?branch=develop">
</a>

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

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

### Developer Handbook

To enable the [developer handbook](https://centerforopenscience.github.io/ember-osf-web/handbook) locally,
add the following to your `config/local.js`:
```ts
module.exports = {
HANDBOOK_ENABLED: true,
};
```
The handbook will be available at [http://localhost:4200/handbook](http://localhost:4200/handbook).

To enable (experimental) auto-generated docs in the handbook, you can also set
`HANDBOOK_DOC_GENERATION_ENABLED: true` in your local config.

#### Enable handbook on your fork

1. [Generate a deploy key](https://developer.github.com/v3/guides/managing-deploy-keys/)
* `ssh-keygen -t rsa -b 4096 -C <your@email.com>`
* Enter file in which to save the key (~/.ssh/id_rsa): `~/deploy_key`
* Press enter twice for no passphrase
2. Add the public key in your GitHub repository settings
* `cat ~/deploy_key.pub | pbcopy`
* Go to `https://github.com/<org>/<repo>/settings/keys/new`
* Title: `Travis CI`
* Key: paste in the public key
* ☑️ Allow write access
3. Add the base64-encoded private key to Travis CI
* `cat ~/deploy_key | base64 | pbcopy`
* Go to `https://travis-ci.org/<org>/<repo>/settings`
* Under Environment Variables, add
* Name: `DEPLOY_KEY`
* Value: paste in the private key
* 'Leave Display Value in Build log' off
* Click Add
4. Delete the keypair
* `rm ~/deploy_key ~/deploy_key.pub`

### Code Generators

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

0 comments on commit 25b0b99

Please sign in to comment.