mirror of
https://github.com/maputnik/editor.git
synced 2026-08-25 22:47:39 +00:00
Rename primary branch to main (#837)
Co-authored-by: Harel M <harel.mazor@gmail.com>
This commit is contained in:
@@ -9,7 +9,7 @@ assignees: ''
|
|||||||
|
|
||||||
<!-- Thanks for your feedback! Please complete the following information: -->
|
<!-- Thanks for your feedback! Please complete the following information: -->
|
||||||
|
|
||||||
**Maputnik version**:<!-- e.g v1.7.0, master -->
|
**Maputnik version**:<!-- e.g v1.7.0, main -->
|
||||||
**Browser**:
|
**Browser**:
|
||||||
**OS**:<!-- (Windows, macOS, Linux) -->
|
**OS**:<!-- (Windows, macOS, Linux) -->
|
||||||
|
|
||||||
|
|||||||
@@ -2,9 +2,9 @@ name: ci
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [ master ]
|
branches: [ main ]
|
||||||
push:
|
push:
|
||||||
branches: [ master ]
|
branches: [ main ]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
||||||
@@ -35,7 +35,7 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- run: docker build -t docker.pkg.github.com/maputnik/editor/editor:master .
|
- run: docker build -t docker.pkg.github.com/maputnik/editor/editor:main .
|
||||||
|
|
||||||
# build the editor
|
# build the editor
|
||||||
build-node:
|
build-node:
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ name: deploy
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ master ]
|
branches: [ main ]
|
||||||
push:
|
push:
|
||||||
tags:
|
tags:
|
||||||
- 'v*'
|
- 'v*'
|
||||||
@@ -23,5 +23,5 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u orangemug --password-stdin
|
- run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u orangemug --password-stdin
|
||||||
- run: docker build -t docker.pkg.github.com/maputnik/editor/editor:master .
|
- run: docker build -t docker.pkg.github.com/maputnik/editor/editor:main .
|
||||||
- run: docker push docker.pkg.github.com/maputnik/editor/editor:master
|
- run: docker push docker.pkg.github.com/maputnik/editor/editor:main
|
||||||
|
|||||||
@@ -21,14 +21,14 @@ export default class Doc extends React.Component {
|
|||||||
|
|
||||||
const renderValues = (
|
const renderValues = (
|
||||||
!!values &&
|
!!values &&
|
||||||
// HACK: Currently we merge additional values into the stylespec, so this is required
|
// HACK: Currently we merge additional values into the style spec, so this is required
|
||||||
// See <https://github.com/maputnik/editor/blob/master/src/components/fields/PropertyGroup.jsx#L16>
|
// See <https://github.com/maputnik/editor/blob/main/src/components/PropertyGroup.jsx#L16>
|
||||||
!Array.isArray(values)
|
!Array.isArray(values)
|
||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{doc &&
|
{doc &&
|
||||||
<div className="SpecDoc">
|
<div className="SpecDoc">
|
||||||
<div className="SpecDoc__doc">{doc}</div>
|
<div className="SpecDoc__doc">{doc}</div>
|
||||||
{renderValues &&
|
{renderValues &&
|
||||||
|
|||||||
Reference in New Issue
Block a user