Merge branch 'master' into github-actions-windows

This commit is contained in:
Ajitem Sahasrabuddhe 2020-01-13 22:10:45 +05:30 committed by GitHub
commit 8fe6194446
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions

View File

@ -63,7 +63,12 @@ jobs:
with: with:
go-version: ${{ matrix.go }} go-version: ${{ matrix.go }}
- name: Set GOPATH, PATH and ENV - name: Use Node.js 12.x
uses: actions/setup-node@v1
with:
node-version: 12.x
- name: - name: Set GOPATH, PATH and ENV
run: | run: |
echo "::set-env name=GOPATH::$(dirname $GITHUB_WORKSPACE)" echo "::set-env name=GOPATH::$(dirname $GITHUB_WORKSPACE)"
echo "::set-env name=GO111MODULE::on" echo "::set-env name=GO111MODULE::on"
@ -81,7 +86,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 (v1) - name: Run Tests (v1)
if: contains(github.base_ref, 'v1') if: contains(github.base_ref, 'v1')

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
} }