Skip to content

Commit 6a36743

Browse files
authored
Merge branch 'master' into if_then_else
2 parents a08c563 + dffebb7 commit 6a36743

File tree

70 files changed

+1091
-1907
lines changed

Some content is hidden

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

70 files changed

+1091
-1907
lines changed

.github/workflows/ci.yml

+18-18
Original file line numberDiff line numberDiff line change
@@ -79,24 +79,24 @@ jobs:
7979
env:
8080
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8181

82-
deploy_canary:
83-
runs-on: ubuntu-latest
84-
if: github.ref == 'refs/heads/master'
85-
name: Deploy canary version of packages to npm
86-
needs: [build]
87-
steps:
88-
- uses: actions/checkout@v2
89-
- name: Use Node.js 14.x
90-
uses: actions/[email protected]
91-
with:
92-
node-version: 14.x
93-
- run: npm ci
94-
- run: echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} > .npmrc
95-
env:
96-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
97-
- run: npx lerna publish from-package --yes --no-verify-access --canary
98-
- if: always()
99-
run: rm .npmrc
82+
# deploy_canary:
83+
# runs-on: ubuntu-latest
84+
# if: github.ref == 'refs/heads/master'
85+
# name: Deploy canary version of packages to npm
86+
# needs: [build]
87+
# steps:
88+
# - uses: actions/checkout@v2
89+
# - name: Use Node.js 14.x
90+
# uses: actions/[email protected]
91+
# with:
92+
# node-version: 14.x
93+
# - run: npm ci
94+
# - run: echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} > .npmrc
95+
# env:
96+
# NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
97+
# - run: npx lerna publish from-package --yes --no-verify-access --canary
98+
# - if: always()
99+
# run: rm .npmrc
100100

101101
docs:
102102
runs-on: ubuntu-latest

.github/workflows/release.yml

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: Release
22
on:
33
release:
44
types: [published]
5+
push:
6+
branches: rel
57

68
jobs:
79
release_to_npm:

docs/api-reference/themes/semantic-ui/uiSchema.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,10 @@ wrapLabel: wrap all labels in a div, for custom styling via CSS
106106
```jsx
107107
<Form
108108
formContext={{
109-
"semantic"={
109+
"semantic" : {
110110
"wrapLabel": true,
111111
"wrapContent": true
112112
}
113-
uiSchema={uiSchema}
114113
// other props...
115114
}}
116115
/>

lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"packages": [
33
"packages/*"
44
],
5-
"version": "3.0.1"
5+
"version": "3.1.0"
66
}

package-lock.json

+26-26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)