Skip to content

Commit 7d06172

Browse files
authored
Merge pull request #345 from developmentseed/develop
Release v2.0.0
2 parents 2ee9c1c + 9cc5fd1 commit 7d06172

File tree

235 files changed

+11715
-12779
lines changed

Some content is hidden

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

235 files changed

+11715
-12779
lines changed

.circleci/config.yml

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

.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
NEXTAUTH_URL=http://127.0.0.1:3000
2+
DATABASE_URL=postgres://postgres:postgres@localhost:5433/osm-teams?sslmode=disable

.env.development

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
NEXTAUTH_SECRET=next-auth-development-secret

.env.sample

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

.env.test

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
NEXTAUTH_URL=http://127.0.0.1:3000
2+
NEXTAUTH_SECRET=next-auth-cypress-secret
3+
DATABASE_URL=postgres://postgres:postgres@localhost:5434/osm-teams-test
4+
TESTING=true

.eslintrc

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
2-
"root": true,
3-
"extends": ["devseed-standard"],
4-
"rules": {
5-
"camelcase": "off",
6-
"node/no-deprecated-api": ["error", {
7-
"ignoreModuleItems": ["url.parse"]
8-
}]
9-
}
2+
"env": {
3+
"es6": true
4+
},
5+
"extends": [
6+
"eslint:recommended",
7+
"next/core-web-vitals",
8+
"plugin:prettier/recommended",
9+
"plugin:cypress/recommended"
10+
]
1011
}

.github/workflows/test.yml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Test
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
- synchronize
8+
- reopened
9+
- ready_for_review
10+
11+
jobs:
12+
test:
13+
runs-on: ubuntu-latest
14+
if: github.event.pull_request.draft == false
15+
timeout-minutes: 30
16+
steps:
17+
- name: Cancel Previous Runs
18+
uses: styfle/cancel-workflow-action@0.11.0
19+
with:
20+
access_token: ${{ github.token }}
21+
22+
- uses: actions/checkout@v2
23+
with:
24+
ref: ${{ github.event.pull_request.head.sha }}
25+
26+
- name: Checkout
27+
uses: actions/checkout@v2
28+
29+
- name: Setup node from node version file
30+
uses: actions/setup-node@v2
31+
with:
32+
node-version-file: '.nvmrc'
33+
cache: 'npm'
34+
35+
- name: Install
36+
if: steps.cache-node-modules.outputs.cache-hit != 'true'
37+
run: yarn install
38+
39+
- name: Lint
40+
run: yarn lint
41+
42+
- name: Docker - Pull
43+
run: docker-compose pull
44+
45+
- name: Docker - Start Test DB
46+
run: docker-compose up --build -d test-db
47+
48+
- name: Migrate database
49+
run: for i in {1..6}; do yarn migrate:test && break || sleep 10; done # retries up to 6 times every 10 s if db is not available
50+
51+
- name: Run API tests
52+
run: yarn test
53+
54+
- name: Run Cypress tests
55+
run: yarn e2e
56+
57+
- name: Docker Cleanup
58+
run: docker-compose kill

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ node_modules
33
tmp
44
*.log*
55
.next
6-
*.env
76
.vscode
87
*.db
98
# ignore node_modules symlink
@@ -12,4 +11,6 @@ node_modules.nosync
1211
hydra-config/prod/prod.yml
1312
.nyc_output
1413
coverage
15-
docker-data/*
14+
docker-data/*
15+
public/swagger.json
16+
.env*.local

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14
1+
18

.prettierrc.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"singleQuote": true,
3+
"tabWidth": 2,
4+
"jsxSingleQuote": true,
5+
"semi": false
6+
}

0 commit comments

Comments
 (0)