Skip to content

Commit 2bb0b3e

Browse files
dplewisdplewis
committed
Merge branch 'master' into snyk-upgrade-0428ebd2453b85bc5522305714401dcb
2 parents ef897ab + 041bdf5 commit 2bb0b3e

File tree

10 files changed

+255
-142
lines changed

10 files changed

+255
-142
lines changed

‎.github/workflows/ci.yml

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
name: ci
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
branches:
8+
- '**'
9+
env:
10+
COVERAGE_OPTION: ./node_modules/.bin/nyc
11+
NODE_VERSION: 10
12+
PARSE_SERVER_TEST_TIMEOUT: 20000
13+
jobs:
14+
check-mongo:
15+
strategy:
16+
matrix:
17+
include:
18+
- name: Mongo 4.0.4, ReplicaSet, WiredTiger
19+
MONGODB_VERSION: 4.0.4
20+
MONGODB_TOPOLOGY: replicaset
21+
MONGODB_STORAGE_ENGINE: wiredTiger
22+
NODE_VERSION: 10
23+
- name: Mongo 3.6.21
24+
MONGODB_VERSION: 3.6.21
25+
NODE_VERSION: 10
26+
- name: Redis Cache
27+
PARSE_SERVER_TEST_CACHE: redis
28+
NODE_VERSION: 10
29+
- name: Node 12.12.0
30+
NODE_VERSION: 12.12.0
31+
name: ${{ matrix.name }}
32+
timeout-minutes: 30
33+
runs-on: ubuntu-18.04
34+
services:
35+
redis:
36+
image: redis
37+
ports:
38+
- 6379:6379
39+
env:
40+
MONGODB_VERSION: ${{ matrix.MONGODB_VERSION }}
41+
MONGODB_TOPOLOGY: ${{ matrix.MONGODB_TOPOLOGY }}
42+
MONGODB_STORAGE_ENGINE: ${{ matrix.MONGODB_STORAGE_ENGINE }}
43+
PARSE_SERVER_TEST_CACHE: ${{ matrix.PARSE_SERVER_TEST_CACHE }}
44+
NODE_VERSION: ${{ matrix.NODE_VERSION }}
45+
steps:
46+
- uses: actions/checkout@v2
47+
- name: Use Node.js ${{ matrix.NODE_VERSION }}
48+
uses: actions/setup-node@v1
49+
with:
50+
node-version: ${{ matrix.NODE_VERSION }}
51+
- name: Cache Node.js modules
52+
uses: actions/cache@v2
53+
with:
54+
path: ~/.npm
55+
key: ${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
56+
restore-keys: |
57+
${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-
58+
- name: Install dependencies
59+
run: npm ci
60+
- if: ${{ matrix.name == 'Mongo 3.6.21' }}
61+
run: npm run lint
62+
- run: npm run pretest
63+
- run: npm run coverage
64+
env:
65+
CI: true
66+
- run: bash <(curl -s https://codecov.io/bash)
67+
check-postgres:
68+
name: Postgresql
69+
timeout-minutes: 30
70+
runs-on: ubuntu-18.04
71+
services:
72+
redis:
73+
image: redis
74+
ports:
75+
- 6379:6379
76+
postgres:
77+
image: postgis/postgis:11-3.0
78+
env:
79+
POSTGRES_PASSWORD: postgres
80+
ports:
81+
- 5432:5432
82+
options: >-
83+
--health-cmd pg_isready
84+
--health-interval 10s
85+
--health-timeout 5s
86+
--health-retries 5
87+
env:
88+
PARSE_SERVER_TEST_DB: postgres
89+
POSTGRES_MAJOR_VERSION: 11
90+
PARSE_SERVER_TEST_DATABASE_URI: postgres://postgres:postgres@localhost:5432/parse_server_postgres_adapter_test_database
91+
steps:
92+
- uses: actions/checkout@v2
93+
- name: Use Node.js 10
94+
uses: actions/setup-node@v1
95+
with:
96+
node-version: 10
97+
- name: Cache Node.js modules
98+
uses: actions/cache@v2
99+
with:
100+
path: ~/.npm
101+
key: ${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
102+
restore-keys: |
103+
${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-
104+
- name: Install dependencies
105+
run: npm ci
106+
- run: bash scripts/before_script_postgres.sh
107+
- run: npm run coverage
108+
env:
109+
CI: true
110+
- run: bash <(curl -s https://codecov.io/bash)

‎.travis.yml

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

‎README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010

1111
<p align="center">
1212
<a href="https://twitter.com/intent/follow?screen_name=parseplatform"><img alt="Follow on Twitter" src="https://img.shields.io/twitter/follow/parseplatform?style=social&label=Follow"></a>
13-
<a href="https://travis-ci.org/parse-community/parse-server"><img alt="Build status" src="https://img.shields.io/travis/parse-community/parse-server/master.svg?style=flat"></a>
13+
<a href="https://github.com/parse-community/parse-server/actions?query=workflow%3Aci+branch%3Amaster">
14+
<img alt="Build status" src="https://github.com/parse-community/parse-server/workflows/ci/badge.svg?branch=master">
15+
</a>
1416
<a href="https://codecov.io/github/parse-community/parse-server?branch=master"><img alt="Coverage status" src="https://img.shields.io/codecov/c/github/parse-community/parse-server/master.svg"></a>
1517
<a href="https://www.npmjs.com/package/parse-server"><img alt="npm version" src="https://img.shields.io/npm/v/parse-server.svg?style=flat"></a>
1618
<a href="https://community.parseplatform.org/"><img alt="Join the conversation" src="https://img.shields.io/discourse/https/community.parseplatform.org/topics.svg"></a>

‎package-lock.json

Lines changed: 84 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"lru-cache": "5.1.1",
4848
"mime": "2.4.6",
4949
"mongodb": "3.6.2",
50-
"parse": "2.17.0",
50+
"parse": "2.18.0",
5151
"pg-promise": "10.7.3",
5252
"pluralize": "8.0.0",
5353
"redis": "3.0.2",

0 commit comments

Comments
 (0)