Skip to content

Commit

Permalink
Replace make with mage
Browse files Browse the repository at this point in the history
Fixes #3937
  • Loading branch information
bep committed Oct 5, 2017
1 parent 06e5633 commit 8d2580f
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 95 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ matrix:
- go: tip
fast_finish: true
install:
- make vendor
- go get github.com/magefile/mage
- mage vendor
script:
- make hugo-race check
- mage hugoRace
- mage -v check
- ./hugo -s docs/
- ./hugo --renderToMemory -s docs/
before_install:
Expand Down
8 changes: 5 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,13 @@ started:

### Build Hugo with Your Changes

**Note:** Hugo uses [mage](https://github.com/magefile/mage) to build.

```bash
cd $HOME/go/src/github.com/gohugoio/hugo
make hugo
mage hugo
# or to install in $HOME/go/bin:
make install
mage install
```

### Updating the Hugo Sources
Expand All @@ -160,6 +162,6 @@ well.

```
git pull
make vendor
mage vendor
```

86 changes: 0 additions & 86 deletions Makefile

This file was deleted.

5 changes: 3 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
init:
- copy c:\MinGW\bin\mingw32-make.exe c:\MinGW\bin\make.exe
- set PATH=%PATH%;C:\MinGW\bin;%GOPATH%\bin
- go version
- go env
Expand All @@ -10,8 +9,10 @@ clone_folder: C:\GOPATH\src\github.com\gohugoio\hugo
install:
- gem install asciidoctor
- pip install docutils
- go get github.com/magefile/mage

build_script:
- make hugo-race check
- mage hugoRace
- mage -v check
- hugo -s docs/
- hugo --renderToMemory -s docs/
6 changes: 4 additions & 2 deletions snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@ parts:
export GOPATH=$(dirname $SNAPCRAFT_PART_INSTALL)/go
export PATH=$GOPATH/bin:$PATH
cd $GOPATH/src/github.com/gohugoio/hugo
make vendor
make test
go get github.com/magefile/mage
mage vendor
mage test
rm -f $GOPATH/bin/govendor
rm -f $GOPATH/bin/mage
install: |
strip --remove-section=.comment --remove-section=.note $SNAPCRAFT_PART_INSTALL/bin/hugo
after: [go]
Expand Down

0 comments on commit 8d2580f

Please sign in to comment.