Merge branch 'master' into lynncyrin-patch-1

This commit is contained in:
lynn [they] 2020-01-13 09:34:40 -08:00 committed by GitHub
commit 17f8abc0da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 25 deletions

View File

@ -4,38 +4,44 @@
If a section of the PR template does not apply to this PR, then delete that section. If a section of the PR template does not apply to this PR, then delete that section.
--> -->
## Motivation ## What type of PR is this?
_(fill-in or delete this section)_ _(REQUIRED)_
- [ ] bug
- [ ] cleanup
- [ ] documentation
- [ ] feature
## What this PR does / why we need it:
_(REQUIRED)_
<!-- <!--
What goal is this change working towards? What goal is this change working towards?
Provide a bullet pointed summary of how each file was changed.
Briefly explain any decisions you made with respect to the changes.
Include anything here that you didn't include in *Release Notes*
above, such as changes to CI or changes to internal methods.
-->
## Which issue(s) this PR fixes:
_(REQUIRED)_
<!--
If this PR fixes one of more issues, list them here. If this PR fixes one of more issues, list them here.
One line each, like so: One line each, like so:
Fixes #123 Fixes #123
Fixes #39 Fixes #39
--> -->
## Release Notes ## Special notes for your reviewer:
_(fill-in or delete this section)_ _(fill-in or delete this section)_
<!-- <!--
If this PR makes user facing changes, please describe them here. Is there any particular feedback you would / wouldn't like?
This description will be copied into the release notes, whenever Which parts of the code should reviewers focus on?
the next version is released. Keep this section short, and
focus on high level changes.
-->
## Changes
_(fill-in or delete this section)_
<!--
Provide a bullet pointed summary of how each file was changed.
Briefly explain any decisions you made with respect to the changes.
Include anything here that you didn't include in *Release Notes*
above, such as changes to CI or changes to internal methods.
--> -->
## Testing ## Testing
@ -46,11 +52,18 @@ _(fill-in or delete this section)_
Describe how you tested this change. Describe how you tested this change.
--> -->
## Reviewer Guidelines ## Release Notes
_(fill-in or delete this section)_
_(REQUIRED)_
<!-- <!--
Is there any particular feedback you would / wouldn't like? If this PR makes user facing changes, please describe them here. This
Which parts of the code should reviewers focus on? description will be copied into the release notes/changelog, whenever the
next version is released. Keep this section short, and focus on high level
changes.
Put your text between the block. To omit notes, use NONE within the block.
--> -->
```release-note
```

View File

@ -28,6 +28,11 @@ jobs:
with: with:
go-version: ${{ matrix.go }} go-version: ${{ matrix.go }}
- name: Use Node.js 12.x
uses: actions/setup-node@v1
with:
node-version: 12.x
- name: Set GOPATH and PATH - name: Set GOPATH and PATH
run: | run: |
echo "::set-env name=GOPATH::$(dirname $GITHUB_WORKSPACE)" echo "::set-env name=GOPATH::$(dirname $GITHUB_WORKSPACE)"
@ -44,7 +49,7 @@ jobs:
mkdir -p $GOPATH/bin mkdir -p $GOPATH/bin
curl -L -o $GOPATH/bin/gfmrun "https://github.com/urfave/gfmrun/releases/download/v1.2.14/gfmrun-$(go env GOOS)-amd64-v1.2.14" curl -L -o $GOPATH/bin/gfmrun "https://github.com/urfave/gfmrun/releases/download/v1.2.14/gfmrun-$(go env GOOS)-amd64-v1.2.14"
chmod +x $GOPATH/bin/gfmrun chmod +x $GOPATH/bin/gfmrun
npm install markdown-toc npm install -g markdown-toc@1.2.0
- name: Run Tests - name: Run Tests
run: | run: |

View File

@ -166,7 +166,7 @@ func TocActionFunc(c *cli.Context) error {
filename = "README.md" filename = "README.md"
} }
err := runCmd("node_modules/.bin/markdown-toc", "-i", filename) err := runCmd("markdown-toc", "-i", filename)
if err != nil { if err != nil {
return err return err
} }