Skip to content

Commit a576f72

Browse files
committed
Merge branch 'alpha' into pr/8332
2 parents d156f29 + 8adc054 commit a576f72

Some content is hidden

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

50 files changed

+26117
-5324
lines changed

.eslintrc.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
"node": true,
66
"es6": true
77
},
8-
"parser": "babel-eslint",
8+
"parser": "@babel/eslint-parser",
99
"plugins": [
1010
"flowtype"
1111
],
1212
"parserOptions": {
1313
"ecmaVersion": 6,
14-
"sourceType": "module"
14+
"sourceType": "module",
15+
"requireConfigFile": false
1516
},
1617
"rules": {
1718
"indent": ["error", 2, { "SwitchCase": 1 }],

.github/workflows/ci.yml

+24-17
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: ci
22
on:
33
push:
4-
branches: [ release, alpha, beta ]
4+
branches: [ release*, alpha, beta ]
55
pull_request:
6-
branches: [ release, alpha, beta ]
6+
branches: [ release*, alpha, beta ]
77
env:
8-
NODE_VERSION: 18.12.1
8+
NODE_VERSION: 19.3.0
99
PARSE_SERVER_TEST_TIMEOUT: 20000
1010
jobs:
1111
check-code-analysis:
@@ -137,32 +137,32 @@ jobs:
137137
- name: Check NPM lock file version
138138
uses: mansona/npm-lockfile-version@v1
139139
with:
140-
version: 1
140+
version: 2
141141
check-mongo:
142142
strategy:
143143
matrix:
144144
include:
145145
- name: MongoDB 4.2, ReplicaSet
146146
MONGODB_VERSION: 4.2.19
147147
MONGODB_TOPOLOGY: replicaset
148-
NODE_VERSION: 18.12.1
148+
NODE_VERSION: 19.3.0
149149
- name: MongoDB 4.4, ReplicaSet
150150
MONGODB_VERSION: 4.4.13
151151
MONGODB_TOPOLOGY: replicaset
152-
NODE_VERSION: 18.12.1
152+
NODE_VERSION: 19.3.0
153153
- name: MongoDB 5, ReplicaSet
154154
MONGODB_VERSION: 5.3.2
155155
MONGODB_TOPOLOGY: replicaset
156-
NODE_VERSION: 18.12.1
156+
NODE_VERSION: 19.3.0
157157
- name: MongoDB 6, ReplicaSet
158158
MONGODB_VERSION: 6.0.2
159159
MONGODB_TOPOLOGY: replicaset
160-
NODE_VERSION: 18.12.1
160+
NODE_VERSION: 19.3.0
161161
- name: Redis Cache
162162
PARSE_SERVER_TEST_CACHE: redis
163163
MONGODB_VERSION: 4.4.13
164164
MONGODB_TOPOLOGY: standalone
165-
NODE_VERSION: 18.12.1
165+
NODE_VERSION: 19.3.0
166166
- name: Node 14
167167
MONGODB_VERSION: 4.4.13
168168
MONGODB_TOPOLOGY: standalone
@@ -171,6 +171,10 @@ jobs:
171171
MONGODB_VERSION: 4.4.13
172172
MONGODB_TOPOLOGY: standalone
173173
NODE_VERSION: 16.18.1
174+
- name: Node 18
175+
MONGODB_VERSION: 4.4.13
176+
MONGODB_TOPOLOGY: standalone
177+
NODE_VERSION: 18.12.1
174178
fail-fast: false
175179
name: ${{ matrix.name }}
176180
timeout-minutes: 15
@@ -189,6 +193,9 @@ jobs:
189193
steps:
190194
- name: Fix usage of insecure GitHub protocol
191195
run: sudo git config --system url."https://github".insteadOf "git://github"
196+
- name: Fix git protocol for Node 14
197+
if: ${{ startsWith(matrix.NODE_VERSION, '14.') }}
198+
run: sudo git config --system url."https://github".insteadOf "ssh://git@github"
192199
- uses: actions/checkout@v2
193200
- name: Use Node.js ${{ matrix.NODE_VERSION }}
194201
uses: actions/setup-node@v2
@@ -214,28 +221,28 @@ jobs:
214221
include:
215222
- name: PostgreSQL 11, PostGIS 3.0
216223
POSTGRES_IMAGE: postgis/postgis:11-3.0
217-
NODE_VERSION: 18.12.1
224+
NODE_VERSION: 19.3.0
218225
- name: PostgreSQL 11, PostGIS 3.1
219226
POSTGRES_IMAGE: postgis/postgis:11-3.1
220-
NODE_VERSION: 18.12.1
227+
NODE_VERSION: 19.3.0
221228
- name: PostgreSQL 11, PostGIS 3.2
222229
POSTGRES_IMAGE: postgis/postgis:11-3.2
223-
NODE_VERSION: 18.12.1
230+
NODE_VERSION: 19.3.0
224231
- name: PostgreSQL 11, PostGIS 3.3
225232
POSTGRES_IMAGE: postgis/postgis:11-3.3
226-
NODE_VERSION: 18.12.1
233+
NODE_VERSION: 19.3.0
227234
- name: PostgreSQL 12, PostGIS 3.3
228235
POSTGRES_IMAGE: postgis/postgis:12-3.3
229-
NODE_VERSION: 18.12.1
236+
NODE_VERSION: 19.3.0
230237
- name: PostgreSQL 13, PostGIS 3.3
231238
POSTGRES_IMAGE: postgis/postgis:13-3.3
232-
NODE_VERSION: 18.12.1
239+
NODE_VERSION: 19.3.0
233240
- name: PostgreSQL 14, PostGIS 3.3
234241
POSTGRES_IMAGE: postgis/postgis:14-3.3
235-
NODE_VERSION: 18.12.1
242+
NODE_VERSION: 19.3.0
236243
- name: PostgreSQL 15, PostGIS 3.3
237244
POSTGRES_IMAGE: postgis/postgis:15-3.3
238-
NODE_VERSION: 18.12.1
245+
NODE_VERSION: 19.3.0
239246
fail-fast: false
240247
name: ${{ matrix.name }}
241248
timeout-minutes: 15

2.3.0.md

-82
This file was deleted.

0 commit comments

Comments
 (0)