Skip to content

Commit 9acfa4d

Browse files
committed
Transition 7.0.x branch to 6.1.x
1 parent dc63161 commit 9acfa4d

File tree

3 files changed

+77
-58
lines changed

3 files changed

+77
-58
lines changed
Lines changed: 58 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,64 @@
11
name: Sync Merged PR to Monorepo
22

33
on:
4-
pull_request:
5-
types: [closed]
6-
branches:
7-
- main
8-
- master
4+
pull_request:
5+
types: [closed]
6+
branches:
7+
- main
8+
- master
99

1010
jobs:
11-
sync-to-monorepo:
12-
if: github.event.pull_request.merged == true
13-
runs-on: ubuntu-latest
14-
env:
15-
NODE_VERSION: 20.x
16-
GH_TOKEN: ${{ secrets.MONOREPO_SYNC_TOKEN }}
17-
PR_NUMBER: ${{ github.event.pull_request.number }}
18-
PR_TITLE: ${{ github.event.pull_request.title }}
19-
PR_AUTHOR: ${{ github.event.pull_request.user.login }}
20-
SOURCE_REPO_NAME: ${{ github.event.repository.name }}
21-
MONOREPO_PACKAGE_LOCATION: packages/${{ github.event.repository.name }}
22-
MONOREPO_PATH: ${{ github.workspace }}/monorepo
23-
24-
steps:
25-
- name: Checkout repository
26-
uses: actions/checkout@v4
27-
with:
28-
fetch-depth: 1
29-
30-
- name: Setup Node.js
31-
uses: actions/setup-node@v4
32-
with:
33-
node-version: ${{env.NODE_VERSION}}
34-
35-
- name: Cache node modules
36-
uses: actions/cache@v3
37-
with:
38-
path: node_modules
39-
key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
40-
restore-keys: |
41-
${{ runner.os }}-node-
42-
43-
- name: Installing dependencies
44-
if: steps.cache.outputs.cache-hit != 'true'
45-
uses: borales/actions-yarn@v4
46-
with:
47-
cmd: install --frozen-lockfile
48-
49-
- name: Install zx
50-
run: yarn add zx
51-
52-
- name: Install monorepo-sync package
53-
run: yarn add git+https://github.com/formio/monorepo-sync.git
54-
55-
- name: Clone Monorepo
56-
run: |
57-
gh repo clone formio/formio-monorepo monorepo -- --depth=1
58-
59-
- name: Sync to Monorepo
60-
run: |
61-
echo "Syncing PR #${PR_NUMBER}: ${PR_TITLE}"
62-
node .github/workflows/sync-monorepo.mjs
11+
sync-to-monorepo:
12+
if: github.event.pull_request.merged == true
13+
runs-on: ubuntu-latest
14+
env:
15+
NODE_VERSION: 20.x
16+
GH_TOKEN: ${{ secrets.MONOREPO_SYNC_TOKEN }}
17+
PR_NUMBER: ${{ github.event.pull_request.number }}
18+
PR_TITLE: ${{ github.event.pull_request.title }}
19+
PR_AUTHOR: ${{ github.event.pull_request.user.login }}
20+
SOURCE_REPO_NAME: ${{ github.event.repository.name }}
21+
MONOREPO_PACKAGE_LOCATION: packages/${{ github.event.repository.name }}
22+
MONOREPO_PATH: ${{ github.workspace }}/monorepo
23+
24+
steps:
25+
- name: Checkout repository
26+
uses: actions/checkout@v4
27+
with:
28+
fetch-depth: 1
29+
30+
- name: Setup Node.js
31+
uses: actions/setup-node@v4
32+
with:
33+
node-version: ${{env.NODE_VERSION}}
34+
35+
- name: Cache node modules
36+
uses: actions/cache@v3
37+
with:
38+
path: node_modules
39+
key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
40+
restore-keys: |
41+
${{ runner.os }}-node-
42+
43+
- name: Installing dependencies
44+
if: steps.cache.outputs.cache-hit != 'true'
45+
uses: borales/actions-yarn@v4
46+
with:
47+
cmd: install --frozen-lockfile
48+
49+
- name: Install zx
50+
run: yarn add zx
51+
52+
- name: Install monorepo-sync package
53+
run: yarn add git+https://github.com/formio/monorepo-sync.git
54+
55+
- name: Clone Monorepo
56+
run: |
57+
gh repo clone formio/formio-monorepo monorepo -- --depth=1
58+
59+
- name: Sync to Monorepo
60+
run: |
61+
echo "Syncing PR #${PR_NUMBER}: ${PR_TITLE}"
62+
node .github/workflows/sync-monorepo.mjs
63+
6364
#update

Changelog.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,24 @@ All notable changes to this project will be documented in this file
55
The format is based on [Keep a Changelog](http://keepachangelog.com/)
66
and this project adheres to [Semantic Versioning](http://semver.org/).
77

8+
## [Unreleased: 6.1.0-rc.5]
9+
10+
### Changed
11+
12+
- No breaking changes requiring major version bump, moving to minor patch instead of major.
13+
- FIO-9881: upgraded up to React 19
14+
- FIO-9678: fixed an issue where number value is not displayed is submission grid
15+
- FIO-9671: fix Next pagination button
16+
- do not recreate form instance if the form json is not changed deeply
17+
- refactored Form component code to prevent the exhaustive-deps error for useEffect
18+
- FIO-9589: fixed an issue where form does not work correctly after the react form component rerendering
19+
- FIO-9584: removed pdf display option from builder
20+
- FIO-9592: Fix default submit button
21+
- FIO-9590: Add showing error when trying to save duplicate form names
22+
- FIO-9413: Fix library license check
23+
- FIO-9944: Fixes an issue where some form instances will not be destroyed
24+
- Unpin formiojs and core peer dependencies
25+
826
## 7.0.0-rc.2
927

1028
### Changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@formio/react",
3-
"version": "7.0.0-rc.2",
3+
"version": "6.1.0-rc.5",
44
"description": "React renderer for form.io forms.",
55
"main": "lib/index.js",
66
"scripts": {

0 commit comments

Comments
 (0)