Skip to content

Commit fa2d3d0

Browse files
sadortunsadortun
authored
Merge branch 'master' into pr-migrations
2 parents d244d56 + 20cb333 commit fa2d3d0

32 files changed

+1973
-1551
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/workflows/ci.yml‎

Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches:
88
- '**'
99
env:
10-
NODE_VERSION: 14.17.5
10+
NODE_VERSION: 14.18.0
1111
PARSE_SERVER_TEST_TIMEOUT: 20000
1212
jobs:
1313
check-ci:
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v2
1919
- name: Use Node.js ${{ matrix.NODE_VERSION }}
20-
uses: actions/setup-node@v1
20+
uses: actions/setup-node@v2
2121
with:
2222
node-version: ${{ matrix.node-version }}
2323
- name: Cache Node.js modules
@@ -29,16 +29,25 @@ jobs:
2929
${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-
3030
- name: Install dependencies
3131
run: npm ci
32-
- name: CI Self-Check
32+
- name: CI Environments Check
3333
run: npm run ci:check
34+
- name: CI Node Engine Check
35+
run: npm run ci:checkNodeEngine
36+
check-changelog:
37+
name: Changelog
38+
timeout-minutes: 5
39+
runs-on: ubuntu-18.04
40+
steps:
41+
- uses: actions/checkout@v2
42+
- uses: dangoslen/changelog-enforcer@v2
3443
check-lint:
3544
name: Lint
3645
timeout-minutes: 15
3746
runs-on: ubuntu-18.04
3847
steps:
3948
- uses: actions/checkout@v2
4049
- name: Use Node.js ${{ matrix.NODE_VERSION }}
41-
uses: actions/setup-node@v1
50+
uses: actions/setup-node@v2
4251
with:
4352
node-version: ${{ matrix.node-version }}
4453
- name: Cache Node.js modules
@@ -58,7 +67,7 @@ jobs:
5867
steps:
5968
- uses: actions/checkout@v2
6069
- name: Use Node.js ${{ matrix.NODE_VERSION }}
61-
uses: actions/setup-node@v1
70+
uses: actions/setup-node@v2
6271
with:
6372
node-version: ${{ matrix.node-version }}
6473
- name: Cache Node.js modules
@@ -94,43 +103,43 @@ jobs:
94103
matrix:
95104
include:
96105
- name: MongoDB 5.0, ReplicaSet, WiredTiger
97-
MONGODB_VERSION: 5.0.2
106+
MONGODB_VERSION: 5.0.3
98107
MONGODB_TOPOLOGY: replicaset
99108
MONGODB_STORAGE_ENGINE: wiredTiger
100-
NODE_VERSION: 14.17.5
109+
NODE_VERSION: 14.18.0
101110
- name: MongoDB 4.4, ReplicaSet, WiredTiger
102-
MONGODB_VERSION: 4.4.8
111+
MONGODB_VERSION: 4.4.9
103112
MONGODB_TOPOLOGY: replicaset
104113
MONGODB_STORAGE_ENGINE: wiredTiger
105-
NODE_VERSION: 14.17.5
114+
NODE_VERSION: 14.18.0
106115
- name: MongoDB 4.2, ReplicaSet, WiredTiger
107-
MONGODB_VERSION: 4.2.15
116+
MONGODB_VERSION: 4.2.17
108117
MONGODB_TOPOLOGY: replicaset
109118
MONGODB_STORAGE_ENGINE: wiredTiger
110-
NODE_VERSION: 14.17.5
119+
NODE_VERSION: 14.18.0
111120
- name: MongoDB 4.0, ReplicaSet, WiredTiger
112-
MONGODB_VERSION: 4.0.25
121+
MONGODB_VERSION: 4.0.27
113122
MONGODB_TOPOLOGY: replicaset
114123
MONGODB_STORAGE_ENGINE: wiredTiger
115-
NODE_VERSION: 14.17.5
124+
NODE_VERSION: 14.18.0
116125
- name: MongoDB 4.0, Standalone, MMAPv1
117-
MONGODB_VERSION: 4.0.25
126+
MONGODB_VERSION: 4.0.27
118127
MONGODB_TOPOLOGY: standalone
119128
MONGODB_STORAGE_ENGINE: mmapv1
120-
NODE_VERSION: 14.17.5
129+
NODE_VERSION: 14.18.0
121130
- name: Redis Cache
122131
PARSE_SERVER_TEST_CACHE: redis
123-
MONGODB_VERSION: 4.4.8
132+
MONGODB_VERSION: 4.4.9
124133
MONGODB_TOPOLOGY: standalone
125134
MONGODB_STORAGE_ENGINE: wiredTiger
126-
NODE_VERSION: 14.17.5
135+
NODE_VERSION: 14.18.0
127136
- name: Node 12
128-
MONGODB_VERSION: 4.4.8
137+
MONGODB_VERSION: 4.4.9
129138
MONGODB_TOPOLOGY: standalone
130139
MONGODB_STORAGE_ENGINE: wiredTiger
131-
NODE_VERSION: 12.22.5
140+
NODE_VERSION: 12.22.6
132141
- name: Node 15
133-
MONGODB_VERSION: 4.4.8
142+
MONGODB_VERSION: 4.4.9
134143
MONGODB_TOPOLOGY: standalone
135144
MONGODB_STORAGE_ENGINE: wiredTiger
136145
NODE_VERSION: 15.14.0
@@ -152,7 +161,7 @@ jobs:
152161
steps:
153162
- uses: actions/checkout@v2
154163
- name: Use Node.js ${{ matrix.NODE_VERSION }}
155-
uses: actions/setup-node@v1
164+
uses: actions/setup-node@v2
156165
with:
157166
node-version: ${{ matrix.NODE_VERSION }}
158167
- name: Cache Node.js modules
@@ -175,16 +184,16 @@ jobs:
175184
include:
176185
- name: PostgreSQL 11, PostGIS 3.0
177186
POSTGRES_IMAGE: postgis/postgis:11-3.0
178-
NODE_VERSION: 14.17.5
187+
NODE_VERSION: 14.18.0
179188
- name: PostgreSQL 11, PostGIS 3.1
180189
POSTGRES_IMAGE: postgis/postgis:11-3.1
181-
NODE_VERSION: 14.17.5
190+
NODE_VERSION: 14.18.0
182191
- name: PostgreSQL 12, PostGIS 3.1
183192
POSTGRES_IMAGE: postgis/postgis:12-3.1
184-
NODE_VERSION: 14.17.5
193+
NODE_VERSION: 14.18.0
185194
- name: PostgreSQL 13, PostGIS 3.1
186195
POSTGRES_IMAGE: postgis/postgis:13-3.1
187-
NODE_VERSION: 14.17.5
196+
NODE_VERSION: 14.18.0
188197
fail-fast: false
189198
name: ${{ matrix.name }}
190199
timeout-minutes: 15
@@ -212,7 +221,7 @@ jobs:
212221
steps:
213222
- uses: actions/checkout@v2
214223
- name: Use Node.js ${{ matrix.NODE_VERSION }}
215-
uses: actions/setup-node@v1
224+
uses: actions/setup-node@v2
216225
with:
217226
node-version: ${{ matrix.NODE_VERSION }}
218227
- name: Cache Node.js modules

‎.github/workflows/docker-publish.yml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: docker
2+
3+
on:
4+
schedule:
5+
# Nightly builds capture upstream updates to dependency images such as node.
6+
- cron: '19 17 * * *'
7+
push:
8+
branches: [ master ]
9+
tags: [ '*.*.*' ]
10+
11+
env:
12+
REGISTRY: docker.io
13+
IMAGE_NAME: parseplatform/parse-server
14+
15+
jobs:
16+
build:
17+
18+
runs-on: ubuntu-18.04
19+
permissions:
20+
contents: read
21+
packages: write
22+
23+
steps:
24+
- name: Determine branch name
25+
id: branch
26+
run: echo "::set-output name=branch_name::${GITHUB_REF#refs/*/}"
27+
28+
- name: Checkout repository
29+
uses: actions/checkout@v2
30+
31+
- name: Set up QEMU
32+
id: qemu
33+
uses: docker/setup-qemu-action@v1
34+
35+
- name: Set up Docker Buildx
36+
uses: docker/setup-buildx-action@v1
37+
38+
- name: Log into Docker Hub
39+
if: github.event_name != 'pull_request'
40+
uses: docker/login-action@v1
41+
with:
42+
username: ${{ secrets.DOCKERHUB_USERNAME }}
43+
password: ${{ secrets.DOCKERHUB_TOKEN }}
44+
45+
- name: Extract Docker metadata
46+
id: meta
47+
uses: docker/metadata-action@v3
48+
with:
49+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
50+
flavor: |
51+
latest=${{ steps.branch.outputs.branch_name == 'master' }}
52+
53+
- name: Build and push Docker image
54+
uses: docker/build-push-action@v2
55+
with:
56+
context: .
57+
platforms: linux/amd64, linux/arm/v6, linux/arm/v7, linux/arm64/v8
58+
push: ${{ github.event_name != 'pull_request' }}
59+
tags: ${{ steps.meta.outputs.tags }}
60+
labels: ${{ steps.meta.outputs.labels }}

‎.github/workflows/release-manual-docker.yml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# Trigger this workflow only to manually create a Docker release; this should only be used
2+
# in extraordinary circumstances, as Docker releases are normally created automatically as
3+
# part of the automated release workflow.
4+
5+
name: release-manual-docker
6+
on:
7+
workflow_dispatch:
8+
inputs:
9+
ref:
10+
default: ''
11+
description: 'Reference (tag / SHA):'
12+
env:
13+
REGISTRY: docker.io
14+
IMAGE_NAME: parseplatform/parse-server
15+
jobs:
16+
build:
17+
runs-on: ubuntu-18.04
18+
permissions:
19+
contents: read
20+
packages: write
21+
steps:
22+
- name: Determine branch name
23+
id: branch
24+
run: echo "::set-output name=branch_name::${GITHUB_REF#refs/*/}"
25+
- name: Checkout repository
26+
uses: actions/checkout@v2
27+
with:
28+
ref: ${{ github.event.inputs.ref }}
29+
- name: Set up QEMU
30+
id: qemu
31+
uses: docker/setup-qemu-action@v1
32+
- name: Set up Docker Buildx
33+
uses: docker/setup-buildx-action@v1
34+
- name: Log into Docker Hub
35+
if: github.event_name != 'pull_request'
36+
uses: docker/login-action@v1
37+
with:
38+
username: ${{ secrets.DOCKERHUB_USERNAME }}
39+
password: ${{ secrets.DOCKERHUB_TOKEN }}
40+
- name: Extract Docker metadata
41+
id: meta
42+
uses: docker/metadata-action@v3
43+
with:
44+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
45+
flavor: |
46+
latest=${{ steps.branch.outputs.branch_name == 'master' && github.event.inputs.ref == '' }}
47+
tags: |
48+
type=semver,enable=true,pattern={{version}},value=${{ github.event.inputs.ref }}
49+
type=raw,enable=${{ github.event.inputs.ref == '' }},value=latest
50+
- name: Build and push Docker image
51+
uses: docker/build-push-action@v2
52+
with:
53+
context: .
54+
platforms: linux/amd64, linux/arm/v6, linux/arm/v7, linux/arm64/v8
55+
push: ${{ github.event_name != 'pull_request' }}
56+
tags: ${{ steps.meta.outputs.tags }}
57+
labels: ${{ steps.meta.outputs.labels }}

0 commit comments

Comments
 (0)