Rename primary branch to main (#837)

Co-authored-by: Harel M <harel.mazor@gmail.com>
This commit is contained in:
Yuri Astrakhan
2023-12-17 17:09:10 -05:00
committed by GitHub
parent 1df2e36dbb
commit 17eaa3f204
4 changed files with 10 additions and 10 deletions

View File

@@ -9,7 +9,7 @@ assignees: ''
<!-- 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**:
**OS**:<!-- (Windows, macOS, Linux) -->

View File

@@ -2,9 +2,9 @@ name: ci
on:
pull_request:
branches: [ master ]
branches: [ main ]
push:
branches: [ master ]
branches: [ main ]
jobs:
@@ -35,7 +35,7 @@ jobs:
steps:
- 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-node:

View File

@@ -2,7 +2,7 @@ name: deploy
on:
push:
branches: [ master ]
branches: [ main ]
push:
tags:
- 'v*'
@@ -23,5 +23,5 @@ jobs:
steps:
- uses: actions/checkout@v4
- 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 push 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:main

View File

@@ -21,14 +21,14 @@ export default class Doc extends React.Component {
const renderValues = (
!!values &&
// HACK: Currently we merge additional values into the stylespec, so this is required
// See <https://github.com/maputnik/editor/blob/master/src/components/fields/PropertyGroup.jsx#L16>
// HACK: Currently we merge additional values into the style spec, so this is required
// See <https://github.com/maputnik/editor/blob/main/src/components/PropertyGroup.jsx#L16>
!Array.isArray(values)
);
return (
<>
{doc &&
{doc &&
<div className="SpecDoc">
<div className="SpecDoc__doc">{doc}</div>
{renderValues &&