Skip to content

Commit

Permalink
Switch default branch from master to main
Browse files Browse the repository at this point in the history
Also, remove the `develop` branch to simplify the contribution flow.
  • Loading branch information
neocotic committed May 29, 2022
1 parent 18f65d0 commit 5e39f45
Show file tree
Hide file tree
Showing 16 changed files with 18,919 additions and 69 deletions.
18 changes: 10 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ name: CI
on:
push:
branches:
- master
- main
pull_request:
branches:
- develop
- master
- main

workflow_dispatch:

Expand All @@ -18,14 +17,15 @@ jobs:

strategy:
matrix:
node-version: [14.x]
node: [ 14 ]

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
- name: Checkout
uses: actions/checkout@v3
- name: Setup Node ${{ matrix.node }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
node-version: ${{ matrix.node }}
- name: Install Microsoft fonts
run: |
echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | sudo debconf-set-selections
Expand All @@ -36,5 +36,7 @@ jobs:
run: |
npm install
npm run bootstrap
- name: Lint packages
run: npm run lint
- name: Test packages
run: npm test
1 change: 0 additions & 1 deletion .npmrc

This file was deleted.

12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@ All unit tests should be updated and passing as well. All of this can easily be
# install/update package dependencies
$ npm install
$ npm run bootstrap
# run test suite
$ npm test
# run all checks
$ npm run verify
```

You must have at least [Node.js](https://nodejs.org) version 12.20.0 or newer installed.

Some of the test fixtures include Microsoft-based fonts so, if you're a non-Windows user, you will have to ensure that
you have Microsoft fonts installed. For example; Ubuntu users can do the following:
Some test fixtures include Microsoft-based fonts so, if you're a non-Windows user, you will have to ensure that you have
Microsoft fonts installed. For example; Ubuntu users can do the following:

``` bash
$ sudo apt-get update
$ sudo apt-get install ttf-mscorefonts-installer -y
$ sudo fc-cache -fv
```

All pull requests should be made to the `develop` branch.
All pull requests should be made to the `main` branch.

Don't forget to add your details to the list of
[AUTHORS.md](https://github.com/neocotic/convert-svg/blob/master/AUTHORS.md) if you want your contribution to be
[AUTHORS.md](https://github.com/neocotic/convert-svg/blob/main/AUTHORS.md) if you want your contribution to be
recognized by others.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# convert-svg

[![Build Status](https://img.shields.io/github/workflow/status/neocotic/convert-svg/CI/develop?style=flat-square)](https://github.com/neocotic/convert-svg/actions/workflows/ci.yml)
[![License](https://img.shields.io/github/license/neocotic/convert-svg.svg?style=flat-square)](https://github.com/neocotic/convert-svg/blob/master/LICENSE.md)
[![Build Status](https://img.shields.io/github/workflow/status/neocotic/convert-svg/CI/main?style=flat-square)](https://github.com/neocotic/convert-svg/actions/workflows/ci.yml)
[![License](https://img.shields.io/github/license/neocotic/convert-svg.svg?style=flat-square)](https://github.com/neocotic/convert-svg/blob/main/LICENSE.md)
[![Release](https://img.shields.io/github/release/neocotic/convert-svg.svg?style=flat-square)](https://github.com/neocotic/convert-svg)

This monorepo contains the following [Node.js](https://nodejs.org) packages that can convert a SVG into another format
using headless Chromium:

* [convert-svg-core](https://github.com/neocotic/convert-svg/tree/master/packages/convert-svg-core)
* [convert-svg-test-helper](https://github.com/neocotic/convert-svg/tree/master/packages/convert-svg-test-helper)
* [convert-svg-to-jpeg](https://github.com/neocotic/convert-svg/tree/master/packages/convert-svg-to-jpeg)
* [convert-svg-to-png](https://github.com/neocotic/convert-svg/tree/master/packages/convert-svg-to-png)
* [convert-svg-core](https://github.com/neocotic/convert-svg/tree/main/packages/convert-svg-core)
* [convert-svg-test-helper](https://github.com/neocotic/convert-svg/tree/main/packages/convert-svg-test-helper)
* [convert-svg-to-jpeg](https://github.com/neocotic/convert-svg/tree/main/packages/convert-svg-to-jpeg)
* [convert-svg-to-png](https://github.com/neocotic/convert-svg/tree/main/packages/convert-svg-to-png)

The first two packages are core dependencies for SVG converters, which make up the remainder of the packages, trying to
adhere to the following naming convention:
Expand All @@ -31,4 +31,4 @@ them.

Copyright © 2022 neocotic

See [LICENSE.md](https://github.com/neocotic/convert-svg/raw/master/LICENSE.md) for more information on our MIT license.
See [LICENSE.md](https://github.com/neocotic/convert-svg/raw/main/LICENSE.md) for more information on our MIT license.
5 changes: 1 addition & 4 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,5 @@
"hoist": true,
"nohoist": "puppeteer"
}
},
"npmClientArgs": [
"--no-package-lock"
]
}
}
Loading

0 comments on commit 5e39f45

Please sign in to comment.