Skip to content

Commit b54d3df

Browse files
mtrezzamtrezza
committed
Merge branch 'alpha' into add-versioning-system
2 parents 32b8274 + 87e65d8 commit b54d3df

File tree

99 files changed

+11364
-4636
lines changed

Some content is hidden

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

99 files changed

+11364
-4636
lines changed

‎.babelrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
["@babel/preset-env", {
88
"targets": {
99
"node": "12"
10-
}
10+
},
11+
"exclude": ["proposal-dynamic-import"]
1112
}]
1213
],
1314
"sourceMaps": "inline"

‎.github/ISSUE_TEMPLATE/---1-report-an-issue.md

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ assignees: ''
99

1010
### New Issue Checklist
1111
<!--
12-
Please check the following boxes [x] before submitting your issue.
12+
Check every following box [x] before submitting your issue.
1313
Click the "Preview" tab for better readability.
14-
Thanks for contributing to Parse Server!
14+
Thanks for contributing to Parse Platform!
1515
-->
1616

1717
- [ ] I am not disclosing a [vulnerability](https://github.com/parse-community/parse-server/blob/master/SECURITY.md).
@@ -30,18 +30,7 @@ assignees: ''
3030

3131
### Expected Outcome
3232
<!-- What outcome, for example query result, did you expect? -->
33-
34-
### Failing Test Case / Pull Request
35-
<!--
36-
Check one of the following boxes [x] if you added a PR and add the link.
37-
See the contribution guide for how add a test cases:
38-
https://github.com/parse-community/parse-server/blob/master/CONTRIBUTING.md
39-
-->
40-
41-
- [ ] 🤩 I submitted a PR with a fix and a test case.
42-
- [ ] 🧐 I submitted a PR with a failing test case.
43-
44-
### Environment
33+
### Environment
4534
<!-- Be specific with versions, don't use "latest" or semver ranges like "~x.y.z" or "^x.y.z". -->
4635

4736
Server

‎.github/ISSUE_TEMPLATE/---2-feature-request.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ assignees: ''
99

1010
### New Feature / Enhancement Checklist
1111
<!--
12-
Please check the following boxes [x] before submitting your issue.
12+
Check every following box [x] before submitting your issue.
1313
Click the "Preview" tab for better readability.
14-
Thanks for contributing to Parse Server!
14+
Thanks for contributing to Parse Platform!
1515
-->
1616

1717
- [ ] I am not disclosing a [vulnerability](https://github.com/parse-community/parse-server/blob/master/SECURITY.md).
@@ -31,4 +31,4 @@ assignees: ''
3131
<!-- Which alternatives or workarounds exist currently? -->
3232

3333
### 3rd Party References
34-
<!-- Have you seen a similar functionality provided somewhere else? -->
34+
<!-- Have you seen a similar functionality provided somewhere else? -->

‎.github/pull_request_template.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ Related issue: FILL_THIS_OUT
2222
Delete suggested TODOs that do not apply to this PR.
2323
-->
2424

25-
- [ ] Add test cases
26-
- [ ] Add entry to changelog
25+
- [ ] Add tests
2726
- [ ] Add changes to documentation (guides, repository pages, in-code descriptions)
2827
- [ ] Add [security check](https://github.com/parse-community/parse-server/blob/master/CONTRIBUTING.md#security-checks)
2928
- [ ] Add new Parse Error codes to Parse JS SDK <!-- no hard-coded error codes in Parse Server -->
30-
- [ ] ...
29+
- [x] A changelog entry is created automatically using the pull request title (do not manually add a changelog entry)

‎.github/stale.yml

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

‎.github/workflows/ci-automated-check-environment.yml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# This checks whether there are new CI environment versions available, e.g. MongoDB, Node.js;
2+
# a pull request is created if there are any available.
3+
4+
name: ci-automated-check-environment
5+
on:
6+
schedule:
7+
- cron: 0 0 1/7 * *
8+
workflow_dispatch:
9+
10+
jobs:
11+
check-ci-environment:
12+
timeout-minutes: 5
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout default branch
16+
uses: actions/checkout@v2
17+
- name: Setup Node
18+
uses: actions/setup-node@v2
19+
with:
20+
node-version: 14
21+
- name: Cache Node.js modules
22+
uses: actions/cache@v2
23+
with:
24+
path: ~/.npm
25+
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
26+
restore-keys: |
27+
${{ runner.os }}-node-
28+
- name: Install dependencies
29+
run: npm ci
30+
- name: CI Environments Check
31+
run: npm run ci:check
32+
create-pr:
33+
needs: check-ci-environment
34+
if: failure()
35+
timeout-minutes: 5
36+
runs-on: ubuntu-latest
37+
steps:
38+
- name: Checkout default branch
39+
uses: actions/checkout@v2
40+
- name: Compose branch name for PR
41+
id: branch
42+
run: echo "::set-output name=name::ci-bump-environment"
43+
- name: Create branch
44+
run: |
45+
git config --global user.email ${{ github.actor }}@users.noreply.github.com
46+
git config --global user.name ${{ github.actor }}
47+
git checkout -b ${{ steps.branch.outputs.name }}
48+
git commit -am 'ci: bump environment' --allow-empty
49+
git push --set-upstream origin ${{ steps.branch.outputs.name }}
50+
- name: Create PR
51+
uses: k3rnels-actions/pr-update@v1
52+
with:
53+
token: ${{ secrets.GITHUB_TOKEN }}
54+
pr_title: "ci: bump environment"
55+
pr_source: ${{ steps.branch.outputs.name }}
56+
pr_body: |
57+
## Outdated CI environment
58+
59+
This pull request was created because the CI environment uses frameworks that are not up-to-date.
60+
You can see which frameworks need to be upgraded in the [logs](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}).
61+
62+
*⚠️ Use `Squash and merge` to merge this pull request.*

‎.github/workflows/ci.yml

Lines changed: 52 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
name: ci
22
on:
33
push:
4-
branches:
5-
- master
4+
branches: [ release, alpha, beta, next-major ]
65
pull_request:
76
branches:
87
- '**'
98
env:
10-
NODE_VERSION: 14.16.1
9+
NODE_VERSION: 14.18.1
1110
PARSE_SERVER_TEST_TIMEOUT: 20000
1211
jobs:
1312
check-ci:
14-
name: CI Self-Check
13+
name: Node Engine Check
1514
timeout-minutes: 15
1615
runs-on: ubuntu-18.04
1716
steps:
1817
- uses: actions/checkout@v2
1918
- name: Use Node.js ${{ matrix.NODE_VERSION }}
20-
uses: actions/setup-node@v1
19+
uses: actions/setup-node@v2
2120
with:
2221
node-version: ${{ matrix.node-version }}
2322
- name: Cache Node.js modules
@@ -29,16 +28,16 @@ jobs:
2928
${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-
3029
- name: Install dependencies
3130
run: npm ci
32-
- name: CI Self-Check
33-
run: npm run ci:check
31+
- name: CI Node Engine Check
32+
run: npm run ci:checkNodeEngine
3433
check-lint:
3534
name: Lint
3635
timeout-minutes: 15
3736
runs-on: ubuntu-18.04
3837
steps:
3938
- uses: actions/checkout@v2
4039
- name: Use Node.js ${{ matrix.NODE_VERSION }}
41-
uses: actions/setup-node@v1
40+
uses: actions/setup-node@v2
4241
with:
4342
node-version: ${{ matrix.node-version }}
4443
- name: Cache Node.js modules
@@ -58,7 +57,7 @@ jobs:
5857
steps:
5958
- uses: actions/checkout@v2
6059
- name: Use Node.js ${{ matrix.NODE_VERSION }}
61-
uses: actions/setup-node@v1
60+
uses: actions/setup-node@v2
6261
with:
6362
node-version: ${{ matrix.node-version }}
6463
- name: Cache Node.js modules
@@ -73,12 +72,21 @@ jobs:
7372
- run: npm run madge:circular
7473
check-docker:
7574
name: Docker Build
76-
timeout-minutes: 5
75+
timeout-minutes: 15
7776
runs-on: ubuntu-18.04
7877
steps:
79-
- uses: actions/checkout@v2
78+
- name: Checkout repository
79+
uses: actions/checkout@v2
80+
- name: Set up QEMU
81+
id: qemu
82+
uses: docker/setup-qemu-action@v1
83+
- name: Set up Docker Buildx
84+
uses: docker/setup-buildx-action@v1
8085
- name: Build docker image
8186
uses: docker/build-push-action@v2
87+
with:
88+
context: .
89+
platforms: linux/amd64
8290
check-lock-file-version:
8391
name: NPM Lock File Version
8492
timeout-minutes: 5
@@ -93,39 +101,44 @@ jobs:
93101
strategy:
94102
matrix:
95103
include:
104+
- name: MongoDB 5.0, ReplicaSet, WiredTiger
105+
MONGODB_VERSION: 5.0.3
106+
MONGODB_TOPOLOGY: replicaset
107+
MONGODB_STORAGE_ENGINE: wiredTiger
108+
NODE_VERSION: 14.18.1
96109
- name: MongoDB 4.4, ReplicaSet, WiredTiger
97-
MONGODB_VERSION: 4.4.4
110+
MONGODB_VERSION: 4.4.10
98111
MONGODB_TOPOLOGY: replicaset
99112
MONGODB_STORAGE_ENGINE: wiredTiger
100-
NODE_VERSION: 14.16.1
113+
NODE_VERSION: 14.18.1
101114
- name: MongoDB 4.2, ReplicaSet, WiredTiger
102-
MONGODB_VERSION: 4.2.13
115+
MONGODB_VERSION: 4.2.17
103116
MONGODB_TOPOLOGY: replicaset
104117
MONGODB_STORAGE_ENGINE: wiredTiger
105-
NODE_VERSION: 14.16.1
118+
NODE_VERSION: 14.18.1
106119
- name: MongoDB 4.0, ReplicaSet, WiredTiger
107-
MONGODB_VERSION: 4.0.23
120+
MONGODB_VERSION: 4.0.27
108121
MONGODB_TOPOLOGY: replicaset
109122
MONGODB_STORAGE_ENGINE: wiredTiger
110-
NODE_VERSION: 14.16.1
123+
NODE_VERSION: 14.18.1
111124
- name: MongoDB 4.0, Standalone, MMAPv1
112-
MONGODB_VERSION: 4.0.23
125+
MONGODB_VERSION: 4.0.27
113126
MONGODB_TOPOLOGY: standalone
114127
MONGODB_STORAGE_ENGINE: mmapv1
115-
NODE_VERSION: 14.16.1
128+
NODE_VERSION: 14.18.1
116129
- name: Redis Cache
117130
PARSE_SERVER_TEST_CACHE: redis
118-
MONGODB_VERSION: 4.4.4
131+
MONGODB_VERSION: 4.4.10
119132
MONGODB_TOPOLOGY: standalone
120133
MONGODB_STORAGE_ENGINE: wiredTiger
121-
NODE_VERSION: 14.16.1
134+
NODE_VERSION: 14.18.1
122135
- name: Node 12
123-
MONGODB_VERSION: 4.4.4
136+
MONGODB_VERSION: 4.4.10
124137
MONGODB_TOPOLOGY: standalone
125138
MONGODB_STORAGE_ENGINE: wiredTiger
126-
NODE_VERSION: 12.22.1
139+
NODE_VERSION: 12.22.7
127140
- name: Node 15
128-
MONGODB_VERSION: 4.4.4
141+
MONGODB_VERSION: 4.4.10
129142
MONGODB_TOPOLOGY: standalone
130143
MONGODB_STORAGE_ENGINE: wiredTiger
131144
NODE_VERSION: 15.14.0
@@ -147,7 +160,7 @@ jobs:
147160
steps:
148161
- uses: actions/checkout@v2
149162
- name: Use Node.js ${{ matrix.NODE_VERSION }}
150-
uses: actions/setup-node@v1
163+
uses: actions/setup-node@v2
151164
with:
152165
node-version: ${{ matrix.NODE_VERSION }}
153166
- name: Cache Node.js modules
@@ -170,12 +183,19 @@ jobs:
170183
include:
171184
- name: PostgreSQL 11, PostGIS 3.0
172185
POSTGRES_IMAGE: postgis/postgis:11-3.0
186+
NODE_VERSION: 14.18.1
173187
- name: PostgreSQL 11, PostGIS 3.1
174188
POSTGRES_IMAGE: postgis/postgis:11-3.1
189+
NODE_VERSION: 14.18.1
175190
- name: PostgreSQL 12, PostGIS 3.1
176191
POSTGRES_IMAGE: postgis/postgis:12-3.1
192+
NODE_VERSION: 14.18.1
177193
- name: PostgreSQL 13, PostGIS 3.1
178194
POSTGRES_IMAGE: postgis/postgis:13-3.1
195+
NODE_VERSION: 14.18.1
196+
- name: PostgreSQL 14, PostGIS 3.1
197+
POSTGRES_IMAGE: postgis/postgis:14-3.1
198+
NODE_VERSION: 14.18.1
179199
fail-fast: false
180200
name: ${{ matrix.name }}
181201
timeout-minutes: 15
@@ -199,12 +219,13 @@ jobs:
199219
env:
200220
PARSE_SERVER_TEST_DB: postgres
201221
PARSE_SERVER_TEST_DATABASE_URI: postgres://postgres:postgres@localhost:5432/parse_server_postgres_adapter_test_database
222+
NODE_VERSION: ${{ matrix.NODE_VERSION }}
202223
steps:
203224
- uses: actions/checkout@v2
204-
- name: Use Node.js 10
205-
uses: actions/setup-node@v1
225+
- name: Use Node.js ${{ matrix.NODE_VERSION }}
226+
uses: actions/setup-node@v2
206227
with:
207-
node-version: 10
228+
node-version: ${{ matrix.NODE_VERSION }}
208229
- name: Cache Node.js modules
209230
uses: actions/cache@v2
210231
with:
@@ -214,7 +235,9 @@ jobs:
214235
${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-
215236
- name: Install dependencies
216237
run: npm ci
217-
- run: bash scripts/before_script_postgres.sh
238+
- run: |
239+
bash scripts/before_script_postgres_conf.sh
240+
bash scripts/before_script_postgres.sh
218241
- run: npm run coverage
219242
env:
220243
CI: true

0 commit comments

Comments
 (0)