Skip to content

Commit 0465a73

Browse files
cjblandcjbland
committed
Merge branch 'master' into feature/7517-clear-pointer-graphql
2 parents b70c6a9 + 1a3103a commit 0465a73

Some content is hidden

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

52 files changed

+1687
-875
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: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -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/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: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ on:
77
branches:
88
- '**'
99
env:
10-
NODE_VERSION: 14.17.5
10+
NODE_VERSION: 14.18.1
1111
PARSE_SERVER_TEST_TIMEOUT: 20000
1212
jobs:
1313
check-ci:
14-
name: CI Self-Check
14+
name: Node Engine Check
1515
timeout-minutes: 15
1616
runs-on: ubuntu-18.04
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,8 +29,8 @@ jobs:
2929
${{ runner.os }}-node-${{ matrix.NODE_VERSION }}-
3030
- name: Install dependencies
3131
run: npm ci
32-
- name: CI Self-Check
33-
run: npm run ci:check
32+
- name: CI Node Engine Check
33+
run: npm run ci:checkNodeEngine
3434
check-changelog:
3535
name: Changelog
3636
timeout-minutes: 5
@@ -45,7 +45,7 @@ jobs:
4545
steps:
4646
- uses: actions/checkout@v2
4747
- name: Use Node.js ${{ matrix.NODE_VERSION }}
48-
uses: actions/setup-node@v1
48+
uses: actions/setup-node@v2
4949
with:
5050
node-version: ${{ matrix.node-version }}
5151
- name: Cache Node.js modules
@@ -65,7 +65,7 @@ jobs:
6565
steps:
6666
- uses: actions/checkout@v2
6767
- name: Use Node.js ${{ matrix.NODE_VERSION }}
68-
uses: actions/setup-node@v1
68+
uses: actions/setup-node@v2
6969
with:
7070
node-version: ${{ matrix.node-version }}
7171
- name: Cache Node.js modules
@@ -101,43 +101,43 @@ jobs:
101101
matrix:
102102
include:
103103
- name: MongoDB 5.0, ReplicaSet, WiredTiger
104-
MONGODB_VERSION: 5.0.2
104+
MONGODB_VERSION: 5.0.3
105105
MONGODB_TOPOLOGY: replicaset
106106
MONGODB_STORAGE_ENGINE: wiredTiger
107-
NODE_VERSION: 14.17.5
107+
NODE_VERSION: 14.18.1
108108
- name: MongoDB 4.4, ReplicaSet, WiredTiger
109-
MONGODB_VERSION: 4.4.8
109+
MONGODB_VERSION: 4.4.9
110110
MONGODB_TOPOLOGY: replicaset
111111
MONGODB_STORAGE_ENGINE: wiredTiger
112-
NODE_VERSION: 14.17.5
112+
NODE_VERSION: 14.18.1
113113
- name: MongoDB 4.2, ReplicaSet, WiredTiger
114-
MONGODB_VERSION: 4.2.15
114+
MONGODB_VERSION: 4.2.17
115115
MONGODB_TOPOLOGY: replicaset
116116
MONGODB_STORAGE_ENGINE: wiredTiger
117-
NODE_VERSION: 14.17.5
117+
NODE_VERSION: 14.18.1
118118
- name: MongoDB 4.0, ReplicaSet, WiredTiger
119-
MONGODB_VERSION: 4.0.25
119+
MONGODB_VERSION: 4.0.27
120120
MONGODB_TOPOLOGY: replicaset
121121
MONGODB_STORAGE_ENGINE: wiredTiger
122-
NODE_VERSION: 14.17.5
122+
NODE_VERSION: 14.18.1
123123
- name: MongoDB 4.0, Standalone, MMAPv1
124-
MONGODB_VERSION: 4.0.25
124+
MONGODB_VERSION: 4.0.27
125125
MONGODB_TOPOLOGY: standalone
126126
MONGODB_STORAGE_ENGINE: mmapv1
127-
NODE_VERSION: 14.17.5
127+
NODE_VERSION: 14.18.1
128128
- name: Redis Cache
129129
PARSE_SERVER_TEST_CACHE: redis
130-
MONGODB_VERSION: 4.4.8
130+
MONGODB_VERSION: 4.4.9
131131
MONGODB_TOPOLOGY: standalone
132132
MONGODB_STORAGE_ENGINE: wiredTiger
133-
NODE_VERSION: 14.17.5
133+
NODE_VERSION: 14.18.1
134134
- name: Node 12
135-
MONGODB_VERSION: 4.4.8
135+
MONGODB_VERSION: 4.4.9
136136
MONGODB_TOPOLOGY: standalone
137137
MONGODB_STORAGE_ENGINE: wiredTiger
138-
NODE_VERSION: 12.22.5
138+
NODE_VERSION: 12.22.7
139139
- name: Node 15
140-
MONGODB_VERSION: 4.4.8
140+
MONGODB_VERSION: 4.4.9
141141
MONGODB_TOPOLOGY: standalone
142142
MONGODB_STORAGE_ENGINE: wiredTiger
143143
NODE_VERSION: 15.14.0
@@ -159,7 +159,7 @@ jobs:
159159
steps:
160160
- uses: actions/checkout@v2
161161
- name: Use Node.js ${{ matrix.NODE_VERSION }}
162-
uses: actions/setup-node@v1
162+
uses: actions/setup-node@v2
163163
with:
164164
node-version: ${{ matrix.NODE_VERSION }}
165165
- name: Cache Node.js modules
@@ -182,16 +182,16 @@ jobs:
182182
include:
183183
- name: PostgreSQL 11, PostGIS 3.0
184184
POSTGRES_IMAGE: postgis/postgis:11-3.0
185-
NODE_VERSION: 14.17.5
185+
NODE_VERSION: 14.18.1
186186
- name: PostgreSQL 11, PostGIS 3.1
187187
POSTGRES_IMAGE: postgis/postgis:11-3.1
188-
NODE_VERSION: 14.17.5
188+
NODE_VERSION: 14.18.1
189189
- name: PostgreSQL 12, PostGIS 3.1
190190
POSTGRES_IMAGE: postgis/postgis:12-3.1
191-
NODE_VERSION: 14.17.5
191+
NODE_VERSION: 14.18.1
192192
- name: PostgreSQL 13, PostGIS 3.1
193193
POSTGRES_IMAGE: postgis/postgis:13-3.1
194-
NODE_VERSION: 14.17.5
194+
NODE_VERSION: 14.18.1
195195
fail-fast: false
196196
name: ${{ matrix.name }}
197197
timeout-minutes: 15
@@ -219,7 +219,7 @@ jobs:
219219
steps:
220220
- uses: actions/checkout@v2
221221
- name: Use Node.js ${{ matrix.NODE_VERSION }}
222-
uses: actions/setup-node@v1
222+
uses: actions/setup-node@v2
223223
with:
224224
node-version: ${{ matrix.NODE_VERSION }}
225225
- name: Cache Node.js modules

‎.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 == 'release' && 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 }}

‎.github/workflows/release.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- uses: actions/checkout@v2
1010
- uses: actions/setup-node@v1
1111
with:
12-
node-version: '10.14'
12+
node-version: '12.2'
1313
registry-url: https://registry.npmjs.org/
1414
- name: Cache Node.js modules
1515
uses: actions/cache@v2
@@ -19,9 +19,10 @@ jobs:
1919
restore-keys: |
2020
${{ runner.os }}-node-
2121
- run: npm ci
22-
- run: npm publish
23-
env:
24-
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
22+
# Disable publishing until release automation; enable ad-hoc with correct npm tag (alpha, beta)
23+
# - run: npm publish --tag alpha
24+
# env:
25+
# NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
2526
publish-docs:
2627
runs-on: ubuntu-18.04
2728
timeout-minutes: 30
@@ -30,7 +31,7 @@ jobs:
3031
- name: Use Node.js
3132
uses: actions/setup-node@v1
3233
with:
33-
node-version: '10.14'
34+
node-version: '12.2'
3435
- name: Cache Node.js modules
3536
uses: actions/cache@v2
3637
with:

0 commit comments

Comments
 (0)