Skip to content

Commit 5c09465

Browse files
cycqitianwushugecycqitianwushuge
committed
Merge branch 'source'
* source: (53 commits) chore(release): 3.2.1 [skip ci] chore(release): 3.2.1-beta.1 [skip ci] ci: fix prerelease labels chore(release): 3.2.1-alpha.1 [skip ci] fix: enabling context menu for read-only cells (parse-community#1844) docs: add info about --dev parameter (parse-community#1842) build: merge beta (parse-community#1841) build: merge alpha (parse-community#1840) docs: fix release changelog filename docs: reword changelog quote docs: fix changelog branch names (parse-community#1837) refactor: simplify reading dashboard config from a json file (parse-community#1828) ci: update release branch names chore(release): 3.2.0 [skip ci] feat: add ctrl + arrow key to jump to first/last cell; fix left/right key navigation with hidden columns (parse-community#1827) refactor: upgrade inquirer from 8.1.2 to 8.1.3 (parse-community#1829) refactor: upgrade otpauth from 7.0.5 to 7.0.6 (parse-community#1830) refactor: replace create-react-class with ES6 classes (parse-community#1818) refactor: replace query-string with URLSearchParams (parse-community#1819) docs: fix typo in refactor changelog entry ... # Conflicts: # package-lock.json
2 parents 738ee42 + ba59eaa commit 5c09465

31 files changed

+35243
-22875
lines changed

‎.github/pull_request_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ Related issue: #`FILL_THIS_OUT`
2323
-->
2424

2525
- [ ] Add tests
26-
- [ ] Add entry to changelog
27-
- [ ] Add changes to documentation (guides, repository pages, in-code descriptions)
26+
- [ ] Add changes to documentation (guides, repository pages, in-code descriptions)
27+
- [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 & 25 deletions
This file was deleted.

‎.github/workflows/ci.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches:
88
- '**'
99
env:
10-
NODE_VERSION: 16.9.0
10+
NODE_VERSION: 16.10.0
1111
jobs:
1212
check-ci:
1313
name: CI Self-Check
@@ -37,13 +37,6 @@ jobs:
3737
run: npm run ci:check
3838
- name: CI Node Engine Check
3939
run: npm run ci:checkNodeEngine
40-
check-changelog:
41-
name: Changelog
42-
timeout-minutes: 5
43-
runs-on: ubuntu-18.04
44-
steps:
45-
- uses: actions/checkout@v2
46-
- uses: dangoslen/changelog-enforcer@v2
4740
# check-lint:
4841
# name: Lint
4942
# timeout-minutes: 15
@@ -129,10 +122,9 @@ jobs:
129122
- name: Node 12
130123
NODE_VERSION: 12.22.6
131124
- name: Node 14
132-
NODE_VERSION: 14.17.6
133-
# Enable the following lines when Parse Dashboard reached Node 16 compatibility
134-
# - name: Node 16
135-
# NODE_VERSION: 16.9.0
125+
NODE_VERSION: 14.18.0
126+
- name: Node 16
127+
NODE_VERSION: 16.10.0
136128
fail-fast: false
137129
name: ${{ matrix.name }}
138130
timeout-minutes: 15

‎.github/workflows/release-automated.yml

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
name: release-automated
2+
on:
3+
push:
4+
branches: [ release, alpha, beta, next-major ]
5+
jobs:
6+
release:
7+
runs-on: ubuntu-latest
8+
outputs:
9+
current_tag: ${{ steps.tag.outputs.current_tag }}
10+
steps:
11+
- uses: actions/checkout@v2
12+
with:
13+
persist-credentials: false
14+
- uses: actions/setup-node@v2
15+
with:
16+
node-version: 12
17+
registry-url: https://registry.npmjs.org/
18+
- name: Cache Node.js modules
19+
uses: actions/cache@v2
20+
with:
21+
path: ~/.npm
22+
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
23+
restore-keys: |
24+
${{ runner.os }}-node-
25+
- run: npm ci
26+
- run: npx semantic-release
27+
env:
28+
GH_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
29+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
31+
- name: Determine tag on current commit
32+
id: tag
33+
run: echo "::set-output name=current_tag::$(git describe --tags --abbrev=0 --exact-match || echo '')"
34+
35+
docker:
36+
needs: release
37+
if: needs.release.outputs.current_tag != ''
38+
env:
39+
REGISTRY: docker.io
40+
IMAGE_NAME: parseplatform/parse-dashboard
41+
runs-on: ubuntu-18.04
42+
permissions:
43+
contents: read
44+
packages: write
45+
steps:
46+
- name: Determine branch name
47+
id: branch
48+
run: echo "::set-output name=branch_name::${GITHUB_REF#refs/*/}"
49+
- name: Checkout repository
50+
uses: actions/checkout@v2
51+
with:
52+
ref: ${{ needs.release.outputs.current_tag }}
53+
- name: Set up QEMU
54+
id: qemu
55+
uses: docker/setup-qemu-action@v1
56+
- name: Set up Docker Buildx
57+
uses: docker/setup-buildx-action@v1
58+
- name: Log into Docker Hub
59+
if: github.event_name != 'pull_request'
60+
uses: docker/login-action@v1
61+
with:
62+
username: ${{ secrets.DOCKERHUB_USERNAME }}
63+
password: ${{ secrets.DOCKERHUB_TOKEN }}
64+
- name: Extract Docker metadata
65+
id: meta
66+
uses: docker/metadata-action@v3
67+
with:
68+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
69+
flavor: |
70+
latest=${{ steps.branch.outputs.branch_name == 'release' }}
71+
tags: |
72+
type=semver,pattern={{version}},value=${{ needs.release.outputs.current_tag }}
73+
- name: Build and push Docker image
74+
uses: docker/build-push-action@v2
75+
with:
76+
context: .
77+
platforms: linux/amd64
78+
push: ${{ github.event_name != 'pull_request' }}
79+
tags: ${{ steps.meta.outputs.tags }}
80+
labels: ${{ steps.meta.outputs.labels }}

‎.github/workflows/docker-publish.yml renamed to ‎.github/workflows/release-manual-docker.yml

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,52 @@
1-
name: docker
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.
24

5+
name: release-manual-docker
36
on:
4-
# Disabled as we move to new branch model and plan to change the `latest` tag to mean "latest stable" instead of as currently "latest unstable"
5-
# schedule:
6-
# # Nightly builds capture upstream updates to dependency images such as node.
7-
# - cron: '19 17 * * *'
8-
push:
9-
# Disabled as we move to new branch model and plan to change the `latest` tag to mean "latest stable" instead of as currently "latest unstable"
10-
# branches: [ master ]
11-
tags: [ '*.*.*' ]
12-
7+
workflow_dispatch:
8+
inputs:
9+
ref:
10+
default: ''
11+
description: 'Reference (tag / SHA):'
1312
env:
1413
REGISTRY: docker.io
1514
IMAGE_NAME: parseplatform/parse-dashboard
16-
1715
jobs:
1816
build:
19-
2017
runs-on: ubuntu-18.04
2118
permissions:
2219
contents: read
2320
packages: write
24-
2521
steps:
2622
- name: Determine branch name
2723
id: branch
2824
run: echo "::set-output name=branch_name::${GITHUB_REF#refs/*/}"
29-
3025
- name: Checkout repository
3126
uses: actions/checkout@v2
32-
27+
with:
28+
ref: ${{ github.event.inputs.ref }}
3329
- name: Set up QEMU
3430
id: qemu
3531
uses: docker/setup-qemu-action@v1
36-
3732
- name: Set up Docker Buildx
3833
uses: docker/setup-buildx-action@v1
39-
4034
- name: Log into Docker Hub
4135
if: github.event_name != 'pull_request'
4236
uses: docker/login-action@v1
4337
with:
4438
username: ${{ secrets.DOCKERHUB_USERNAME }}
4539
password: ${{ secrets.DOCKERHUB_TOKEN }}
46-
4740
- name: Extract Docker metadata
4841
id: meta
4942
uses: docker/metadata-action@v3
5043
with:
5144
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
5245
flavor: |
53-
latest=${{ steps.branch.outputs.branch_name == 'master' }}
54-
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
5550
- name: Build and push Docker image
5651
uses: docker/build-push-action@v2
5752
with:

‎.github/workflows/release.yml

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

‎.releaserc/commit.hbs

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
*{{#if scope}} **{{scope}}:**
2+
{{~/if}} {{#if subject}}
3+
{{~subject}}
4+
{{~else}}
5+
{{~header}}
6+
{{~/if}}
7+
8+
{{~!-- commit link --}} {{#if @root.linkReferences~}}
9+
([{{shortHash}}](
10+
{{~#if @root.repository}}
11+
{{~#if @root.host}}
12+
{{~@root.host}}/
13+
{{~/if}}
14+
{{~#if @root.owner}}
15+
{{~@root.owner}}/
16+
{{~/if}}
17+
{{~@root.repository}}
18+
{{~else}}
19+
{{~@root.repoUrl}}
20+
{{~/if}}/
21+
{{~@root.commit}}/{{hash}}))
22+
{{~else}}
23+
{{~shortHash}}
24+
{{~/if}}
25+
26+
{{~!-- commit references --}}
27+
{{~#if references~}}
28+
, closes
29+
{{~#each references}} {{#if @root.linkReferences~}}
30+
[
31+
{{~#if this.owner}}
32+
{{~this.owner}}/
33+
{{~/if}}
34+
{{~this.repository}}#{{this.issue}}](
35+
{{~#if @root.repository}}
36+
{{~#if @root.host}}
37+
{{~@root.host}}/
38+
{{~/if}}
39+
{{~#if this.repository}}
40+
{{~#if this.owner}}
41+
{{~this.owner}}/
42+
{{~/if}}
43+
{{~this.repository}}
44+
{{~else}}
45+
{{~#if @root.owner}}
46+
{{~@root.owner}}/
47+
{{~/if}}
48+
{{~@root.repository}}
49+
{{~/if}}
50+
{{~else}}
51+
{{~@root.repoUrl}}
52+
{{~/if}}/
53+
{{~@root.issue}}/{{this.issue}})
54+
{{~else}}
55+
{{~#if this.owner}}
56+
{{~this.owner}}/
57+
{{~/if}}
58+
{{~this.repository}}#{{this.issue}}
59+
{{~/if}}{{/each}}
60+
{{~/if}}
61+

‎.releaserc/footer.hbs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{{#if noteGroups}}
2+
{{#each noteGroups}}
3+
4+
### {{title}}
5+
6+
{{#each notes}}
7+
* {{#if commit.scope}}**{{commit.scope}}:** {{/if}}{{text}} ([{{commit.shortHash}}]({{commit.shortHash}}))
8+
{{/each}}
9+
{{/each}}
10+
11+
{{/if}}

‎.releaserc/header.hbs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{{#if isPatch~}}
2+
##
3+
{{~else~}}
4+
#
5+
{{~/if}} {{#if @root.linkCompare~}}
6+
[{{version}}](
7+
{{~#if @root.repository~}}
8+
{{~#if @root.host}}
9+
{{~@root.host}}/
10+
{{~/if}}
11+
{{~#if @root.owner}}
12+
{{~@root.owner}}/
13+
{{~/if}}
14+
{{~@root.repository}}
15+
{{~else}}
16+
{{~@root.repoUrl}}
17+
{{~/if~}}
18+
/compare/{{previousTag}}...{{currentTag}})
19+
{{~else}}
20+
{{~version}}
21+
{{~/if}}
22+
{{~#if title}} "{{title}}"
23+
{{~/if}}
24+
{{~#if date}} ({{date}})
25+
{{/if}}

‎.releaserc/template.hbs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{{> header}}
2+
3+
{{#each commitGroups}}
4+
5+
{{#if title}}
6+
### {{title}}
7+
8+
{{/if}}
9+
{{#each commits}}
10+
{{> commit root=@root}}
11+
{{/each}}
12+
{{/each}}
13+
14+
{{> footer}}

0 commit comments

Comments
 (0)