Skip to content

Commit 9f504a9

Browse files
committed
Merge remote-tracking branch 'upstream/alpha' into alpha
2 parents 56b46b6 + fc79281 commit 9f504a9

File tree

11 files changed

+2358
-421
lines changed

11 files changed

+2358
-421
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ jobs:
2222
env:
2323
MONGODB_VERSION: 3.6.9
2424
steps:
25+
- name: Fix usage of insecure GitHub protocol
26+
run: sudo git config --system url."https://github".insteadOf "git://github"
2527
- uses: actions/checkout@v2
2628
- name: Use Node.js
2729
uses: actions/setup-node@v1

.github/workflows/release-automated-scheduler.yml

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
create-pr-release:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- name: Checkout alpha branch
14+
- name: Checkout beta branch
1515
uses: actions/checkout@v2
1616
with:
17-
ref: alpha
17+
ref: beta
1818
- name: Compose branch name for PR
1919
id: branch
2020
run: echo "::set-output name=name::build-release-${{ github.run_id }}${{ github.run_number }}"
@@ -38,4 +38,36 @@ jobs:
3838
This pull request was created because a new release is due according to the release cycle of this repository.
3939
Just resolve any conflicts and it's good to merge. Any version increment will be done by release automation.
4040
41+
*⚠️ Use `Merge commit` to merge this pull request. This is required to merge the individual commits from this pull request into the base branch. Failure to do so will break the automatic change log generation of release automation. Do not use "Squash and merge"!*
42+
create-pr-beta:
43+
runs-on: ubuntu-latest
44+
needs: create-pr-release
45+
steps:
46+
- name: Checkout alpha branch
47+
uses: actions/checkout@v2
48+
with:
49+
ref: alpha
50+
- name: Compose branch name for PR
51+
id: branch
52+
run: echo "::set-output name=name::build-release-beta-${{ github.run_id }}${{ github.run_number }}"
53+
- name: Create branch
54+
run: |
55+
git config --global user.email ${{ github.actor }}@users.noreply.github.com
56+
git config --global user.name ${{ github.actor }}
57+
git checkout -b ${{ steps.branch.outputs.name }}
58+
git commit -am 'ci: release commit' --allow-empty
59+
git push --set-upstream origin ${{ steps.branch.outputs.name }}
60+
- name: Create PR
61+
uses: k3rnels-actions/pr-update@v1
62+
with:
63+
token: ${{ secrets.GITHUB_TOKEN }}
64+
pr_title: "build: release beta"
65+
pr_source: ${{ steps.branch.outputs.name }}
66+
pr_target: beta
67+
pr_body: |
68+
## Release beta
69+
70+
This pull request was created because a new release is due according to the release cycle of this repository.
71+
Just resolve any conflicts and it's good to merge. Any version increment will be done by release automation.
72+
4173
*⚠️ Use `Merge commit` to merge this pull request. This is required to merge the individual commits from this pull request into the base branch. Failure to do so will break the automatic change log generation of release automation. Do not use "Squash and merge"!*

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
[![auto-release](https://img.shields.io/badge/%F0%9F%9A%80-auto--release-9e34eb.svg)](https://github.com/parse-community/parse-dashboard/releases)
1212

1313
[![npm latest version](https://img.shields.io/npm/v/parse/latest.svg)](https://www.npmjs.com/package/parse)
14+
[![npm beta version](https://img.shields.io/npm/v/parse/beta.svg)](https://www.npmjs.com/package/parse)
1415
[![npm alpha version](https://img.shields.io/npm/v/parse/alpha.svg)](https://www.npmjs.com/package/parse)
15-
<!-- [![npm beta version](https://img.shields.io/npm/v/parse/beta.svg)](https://www.npmjs.com/package/parse) -->
1616

1717
[![Backers on Open Collective](https://opencollective.com/parse-server/backers/badge.svg)][open-collective-link]
1818
[![Sponsors on Open Collective](https://opencollective.com/parse-server/sponsors/badge.svg)][open-collective-link]

changelogs/CHANGELOG_alpha.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## [3.4.3-alpha.3](https://github.com/parse-community/Parse-SDK-JS/compare/3.4.3-alpha.2...3.4.3-alpha.3) (2022-07-02)
2+
3+
4+
### Bug Fixes
5+
6+
* subscription to a LiveQuery containing `ParseQuery.select` overrides properties ([#1488](https://github.com/parse-community/Parse-SDK-JS/issues/1488)) ([b80eee4](https://github.com/parse-community/Parse-SDK-JS/commit/b80eee4b010b60d37b34b566880ed19f05d4c801))
7+
18
## [3.4.3-alpha.2](https://github.com/parse-community/Parse-SDK-JS/compare/3.4.3-alpha.1...3.4.3-alpha.2) (2022-05-29)
29

310

changelogs/CHANGELOG_beta.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
## [3.4.4-beta.1](https://github.com/parse-community/Parse-SDK-JS/compare/3.4.3...3.4.4-beta.1) (2022-07-02)
2+
3+
4+
### Bug Fixes
5+
6+
* subscription to a LiveQuery containing `ParseQuery.select` overrides properties ([#1488](https://github.com/parse-community/Parse-SDK-JS/issues/1488)) ([b80eee4](https://github.com/parse-community/Parse-SDK-JS/commit/b80eee4b010b60d37b34b566880ed19f05d4c801))

changelogs/CHANGELOG_release.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## [3.4.3](https://github.com/parse-community/Parse-SDK-JS/compare/3.4.2...3.4.3) (2022-07-02)
2+
3+
4+
### Bug Fixes
5+
6+
* creating a Parse.File with base64 string fails for some file types ([#1467](https://github.com/parse-community/Parse-SDK-JS/issues/1467)) ([c07d6c9](https://github.com/parse-community/Parse-SDK-JS/commit/c07d6c99968163a72b6ab46e7970b7a5ca4ed540))
7+
* invalid name for `Parse.Role` throws incorrect error ([#1481](https://github.com/parse-community/Parse-SDK-JS/issues/1481)) ([8326a6f](https://github.com/parse-community/Parse-SDK-JS/commit/8326a6f1d7cda0ca8c6f1a3a7ea82448881e118e))
8+
19
## [3.4.2](https://github.com/parse-community/Parse-SDK-JS/compare/3.4.1...3.4.2) (2022-05-02)
210

311

0 commit comments

Comments
 (0)