Skip to content

Commit 8eac7f2

Browse files
dblythydblythy
authored
Merge branch 'alpha' into fix-fields
2 parents 5008ae5 + fded5be commit 8eac7f2

File tree

100 files changed

+6720
-2038
lines changed

Some content is hidden

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

100 files changed

+6720
-2038
lines changed

‎.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"presets": [
77
["@babel/preset-env", {
88
"targets": {
9-
"node": "12"
9+
"node": "14"
1010
}
1111
}]
1212
],

‎.github/pull_request_template.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
### Issue Description
1212
<!-- Add a brief description of the issue this PR solves. -->
1313

14-
Related issue: FILL_THIS_OUT
14+
Closes: FILL_THIS_OUT
1515

1616
### Approach
1717
<!-- Add a description of the approach in this PR. -->
@@ -26,4 +26,3 @@ Related issue: FILL_THIS_OUT
2626
- [ ] Add changes to documentation (guides, repository pages, in-code descriptions)
2727
- [ ] Add [security check](https://github.com/parse-community/parse-server/blob/master/CONTRIBUTING.md#security-checks)
2828
- [ ] Add new Parse Error codes to Parse JS SDK <!-- no hard-coded error codes in Parse Server -->
29-
- [x] A changelog entry is created automatically using the pull request title (do not manually add a changelog entry)

‎.github/workflows/ci.yml

Lines changed: 70 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,38 @@
11
name: ci
22
on:
33
push:
4-
branches: [ release, alpha, beta, next-major ]
4+
branches: [ release, alpha, beta ]
55
pull_request:
6-
branches:
7-
- '**'
6+
branches: [ release, alpha, beta ]
87
env:
9-
NODE_VERSION: 16.14.2
8+
NODE_VERSION: 18.12.1
109
PARSE_SERVER_TEST_TIMEOUT: 20000
1110
jobs:
11+
check-code-analysis:
12+
name: Code Analysis
13+
runs-on: ubuntu-latest
14+
permissions:
15+
actions: read
16+
contents: read
17+
security-events: write
18+
strategy:
19+
fail-fast: false
20+
matrix:
21+
language: [ 'javascript' ]
22+
steps:
23+
- name: Checkout repository
24+
uses: actions/checkout@v3
25+
- name: Initialize CodeQL
26+
uses: github/codeql-action/init@v2
27+
with:
28+
languages: ${{ matrix.language }}
29+
source-root: src
30+
- name: Perform CodeQL Analysis
31+
uses: github/codeql-action/analyze@v2
1232
check-ci:
1333
name: Node Engine Check
1434
timeout-minutes: 15
15-
runs-on: ubuntu-20.04
35+
runs-on: ubuntu-latest
1636
steps:
1737
- uses: actions/checkout@v2
1838
- name: Use Node.js ${{ matrix.NODE_VERSION }}
@@ -33,7 +53,7 @@ jobs:
3353
check-lint:
3454
name: Lint
3555
timeout-minutes: 15
36-
runs-on: ubuntu-20.04
56+
runs-on: ubuntu-latest
3757
steps:
3858
- uses: actions/checkout@v2
3959
- name: Use Node.js ${{ matrix.NODE_VERSION }}
@@ -53,7 +73,7 @@ jobs:
5373
check-circular:
5474
name: Circular Dependencies
5575
timeout-minutes: 5
56-
runs-on: ubuntu-20.04
76+
runs-on: ubuntu-latest
5777
steps:
5878
- uses: actions/checkout@v2
5979
- name: Use Node.js ${{ matrix.NODE_VERSION }}
@@ -73,7 +93,7 @@ jobs:
7393
check-docker:
7494
name: Docker Build
7595
timeout-minutes: 15
76-
runs-on: ubuntu-20.04
96+
runs-on: ubuntu-latest
7797
steps:
7898
- name: Checkout repository
7999
uses: actions/checkout@v2
@@ -90,7 +110,7 @@ jobs:
90110
check-lock-file-version:
91111
name: NPM Lock File Version
92112
timeout-minutes: 5
93-
runs-on: ubuntu-20.04
113+
runs-on: ubuntu-latest
94114
steps:
95115
- uses: actions/checkout@v2
96116
- name: Check NPM lock file version
@@ -101,83 +121,53 @@ jobs:
101121
strategy:
102122
matrix:
103123
include:
104-
- name: MongoDB 5.2, ReplicaSet, WiredTiger
105-
MONGODB_VERSION: 5.2.1
106-
MONGODB_TOPOLOGY: replicaset
107-
MONGODB_STORAGE_ENGINE: wiredTiger
108-
NODE_VERSION: 14.19.1
109-
- name: MongoDB 5.1, ReplicaSet, WiredTiger
110-
MONGODB_VERSION: 5.1.1
111-
MONGODB_TOPOLOGY: replicaset
112-
MONGODB_STORAGE_ENGINE: wiredTiger
113-
NODE_VERSION: 14.19.1
114-
- name: MongoDB 5.0, ReplicaSet, WiredTiger
115-
MONGODB_VERSION: 5.0.6
124+
- name: MongoDB 4.2, ReplicaSet
125+
MONGODB_VERSION: 4.2.19
116126
MONGODB_TOPOLOGY: replicaset
117-
MONGODB_STORAGE_ENGINE: wiredTiger
118-
NODE_VERSION: 16.14.2
119-
- name: MongoDB 4.4, ReplicaSet, WiredTiger
127+
NODE_VERSION: 18.12.1
128+
- name: MongoDB 4.4, ReplicaSet
120129
MONGODB_VERSION: 4.4.13
121130
MONGODB_TOPOLOGY: replicaset
122-
MONGODB_STORAGE_ENGINE: wiredTiger
123-
NODE_VERSION: 16.14.2
124-
- name: MongoDB 4.2, ReplicaSet, WiredTiger
125-
MONGODB_VERSION: 4.2.19
131+
NODE_VERSION: 18.12.1
132+
- name: MongoDB 5, ReplicaSet
133+
MONGODB_VERSION: 5.3.2
126134
MONGODB_TOPOLOGY: replicaset
127-
MONGODB_STORAGE_ENGINE: wiredTiger
128-
NODE_VERSION: 16.14.2
129-
- name: MongoDB 4.0, ReplicaSet, WiredTiger
130-
MONGODB_VERSION: 4.0.28
135+
NODE_VERSION: 18.12.1
136+
- name: MongoDB 6, ReplicaSet
137+
MONGODB_VERSION: 6.0.2
131138
MONGODB_TOPOLOGY: replicaset
132-
MONGODB_STORAGE_ENGINE: wiredTiger
133-
NODE_VERSION: 16.14.2
134-
- name: MongoDB 4.0, Standalone, MMAPv1
135-
MONGODB_VERSION: 4.0.28
136-
MONGODB_TOPOLOGY: standalone
137-
MONGODB_STORAGE_ENGINE: mmapv1
138-
NODE_VERSION: 16.14.2
139+
NODE_VERSION: 18.12.1
139140
- name: Redis Cache
140141
PARSE_SERVER_TEST_CACHE: redis
141142
MONGODB_VERSION: 4.4.13
142143
MONGODB_TOPOLOGY: standalone
143-
MONGODB_STORAGE_ENGINE: wiredTiger
144-
NODE_VERSION: 16.14.2
145-
- name: Node 12
146-
MONGODB_VERSION: 4.4.13
147-
MONGODB_TOPOLOGY: standalone
148-
MONGODB_STORAGE_ENGINE: wiredTiger
149-
NODE_VERSION: 12.22.11
144+
NODE_VERSION: 18.12.1
150145
- name: Node 14
151146
MONGODB_VERSION: 4.4.13
152147
MONGODB_TOPOLOGY: standalone
153-
MONGODB_STORAGE_ENGINE: wiredTiger
154-
NODE_VERSION: 14.19.1
155-
- name: Node 17
148+
NODE_VERSION: 14.21.1
149+
- name: Node 16
156150
MONGODB_VERSION: 4.4.13
157151
MONGODB_TOPOLOGY: standalone
158-
MONGODB_STORAGE_ENGINE: wiredTiger
159-
NODE_VERSION: 17.9.0
160-
- name: Node 18
161-
MONGODB_VERSION: 4.4.13
162-
MONGODB_TOPOLOGY: standalone
163-
MONGODB_STORAGE_ENGINE: wiredTiger
164-
NODE_VERSION: 18.1.0
152+
NODE_VERSION: 16.18.1
165153
fail-fast: false
166154
name: ${{ matrix.name }}
167155
timeout-minutes: 15
168-
runs-on: ubuntu-20.04
156+
runs-on: ubuntu-latest
169157
services:
170158
redis:
171159
image: redis
172160
ports:
173161
- 6379:6379
174-
env:
162+
env:
175163
MONGODB_VERSION: ${{ matrix.MONGODB_VERSION }}
176164
MONGODB_TOPOLOGY: ${{ matrix.MONGODB_TOPOLOGY }}
177165
MONGODB_STORAGE_ENGINE: ${{ matrix.MONGODB_STORAGE_ENGINE }}
178166
PARSE_SERVER_TEST_CACHE: ${{ matrix.PARSE_SERVER_TEST_CACHE }}
179167
NODE_VERSION: ${{ matrix.NODE_VERSION }}
180168
steps:
169+
- name: Fix usage of insecure GitHub protocol
170+
run: sudo git config --system url."https://github".insteadOf "git://github"
181171
- uses: actions/checkout@v2
182172
- name: Use Node.js ${{ matrix.NODE_VERSION }}
183173
uses: actions/setup-node@v2
@@ -203,26 +193,32 @@ jobs:
203193
include:
204194
- name: PostgreSQL 11, PostGIS 3.0
205195
POSTGRES_IMAGE: postgis/postgis:11-3.0
206-
NODE_VERSION: 16.14.2
196+
NODE_VERSION: 18.12.1
207197
- name: PostgreSQL 11, PostGIS 3.1
208198
POSTGRES_IMAGE: postgis/postgis:11-3.1
209-
NODE_VERSION: 16.14.2
199+
NODE_VERSION: 18.12.1
210200
- name: PostgreSQL 11, PostGIS 3.2
211201
POSTGRES_IMAGE: postgis/postgis:11-3.2
212-
NODE_VERSION: 16.14.2
213-
- name: PostgreSQL 12, PostGIS 3.2
214-
POSTGRES_IMAGE: postgis/postgis:12-3.2
215-
NODE_VERSION: 16.14.2
216-
- name: PostgreSQL 13, PostGIS 3.2
217-
POSTGRES_IMAGE: postgis/postgis:13-3.2
218-
NODE_VERSION: 16.14.2
219-
- name: PostgreSQL 14, PostGIS 3.2
220-
POSTGRES_IMAGE: postgis/postgis:14-3.2
221-
NODE_VERSION: 16.14.2
202+
NODE_VERSION: 18.12.1
203+
- name: PostgreSQL 11, PostGIS 3.3
204+
POSTGRES_IMAGE: postgis/postgis:11-3.3
205+
NODE_VERSION: 18.12.1
206+
- name: PostgreSQL 12, PostGIS 3.3
207+
POSTGRES_IMAGE: postgis/postgis:12-3.3
208+
NODE_VERSION: 18.12.1
209+
- name: PostgreSQL 13, PostGIS 3.3
210+
POSTGRES_IMAGE: postgis/postgis:13-3.3
211+
NODE_VERSION: 18.12.1
212+
- name: PostgreSQL 14, PostGIS 3.3
213+
POSTGRES_IMAGE: postgis/postgis:14-3.3
214+
NODE_VERSION: 18.12.1
215+
- name: PostgreSQL 15, PostGIS 3.3
216+
POSTGRES_IMAGE: postgis/postgis:15-3.3
217+
NODE_VERSION: 18.12.1
222218
fail-fast: false
223219
name: ${{ matrix.name }}
224220
timeout-minutes: 15
225-
runs-on: ubuntu-20.04
221+
runs-on: ubuntu-latest
226222
services:
227223
redis:
228224
image: redis
@@ -265,3 +261,6 @@ jobs:
265261
env:
266262
CI: true
267263
- run: bash <(curl -s https://codecov.io/bash)
264+
concurrency:
265+
group: ${{ github.workflow }}-${{ github.ref }}
266+
cancel-in-progress: true

‎.github/workflows/release-automated.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: release-automated
22
on:
33
push:
4-
branches: [ release, alpha, beta, next-major ]
4+
branches: [ release, alpha, beta, next-major, 'release-[0-9]+.x.x' ]
55
jobs:
66
release:
77
runs-on: ubuntu-latest
@@ -17,7 +17,7 @@ jobs:
1717
persist-credentials: false
1818
- uses: actions/setup-node@v2
1919
with:
20-
node-version: 14
20+
node-version: 18.1.0
2121
registry-url: https://registry.npmjs.org/
2222
- name: Cache Node.js modules
2323
uses: actions/cache@v2
@@ -93,7 +93,7 @@ jobs:
9393
- name: Use Node.js
9494
uses: actions/setup-node@v1
9595
with:
96-
node-version: 14
96+
node-version: 18.1.0
9797
- name: Cache Node.js modules
9898
uses: actions/cache@v2
9999
with:

0 commit comments

Comments
 (0)