Skip to content

Commit

Permalink
fixd travis windows env
Browse files Browse the repository at this point in the history
  • Loading branch information
erickyan86 committed Apr 4, 2019
1 parent 89f3641 commit 1adb3f5
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 23 deletions.
41 changes: 22 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,28 @@

language: go

go:
- 1.12

before_install:
- go get golang.org/x/tools/cmd/cover
- go get github.com/mattn/goveralls

os:
- windows
script:
- travis_wait 30 mingw32-make test

- linux
script:
- travis_wait 30 make test

- osx
script:
- travis_wait 30 make test
go: 1.12

matrix:
include:
- os: windows
before_install:
- go get golang.org/x/tools/cmd/cover
- go get github.com/mattn/goveralls
install: choco install mingw
script: travis_wait 30 mingw32-make test_win

- os: linux
before_install:
- go get golang.org/x/tools/cmd/cover
- go get github.com/mattn/goveralls
script: travis_wait 30 make test

- os: osx
before_install:
- go get golang.org/x/tools/cmd/cover
- go get github.com/mattn/goveralls
script: travis_wait 30 make test


after_success:
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
# [fractal](https://github.com/fractalplatform/fractal) Changelog
## [0.0.6] - 2019-04-04
### Added
- [CRYPTO] add btcd secp256k1 crypto
### Fixed
- [MAKEFILE] fixed cross platform


## [0.0.5] - 2019-04-04
### Added
- [README] add license badge
Expand All @@ -7,4 +14,5 @@
- [MAKEFILE] add check fmt tag_release release command


[0.0.6]: https://github.com/fractalplatform/fractal/compare/v0.0.5...v0.0.6
[0.0.5]: https://github.com/fractalplatform/fractal/commits/v0.0.5
9 changes: 8 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ GOFILES_NOVENDOR := $(shell go list -f "{{.Dir}}" ./...)
PACKAGES_NOVENDOR := $(shell go list ./...)
WORK_SPACE := ${REPO}/build/_workspace
FT_DIR :=${WORK_SPACE}/src/github.com/fractalplatform
TEMP_GOPATH := $(GOPATH)

export GOPATH := ${WORK_SPACE}

Expand Down Expand Up @@ -86,9 +87,15 @@ build_ftfinder: commit_hash check build_workspace
### Test

.PHONY: test
test: check build_workspace
test: build_workspace
@cd ${FT_DIR}/fractal && scripts/test.sh

.PHONY: test_win
test_win:
@export GOPATH=${TEMP_GOPATH}
@echo ${TEMP_GOPATH}
@echo ${GOPATH}
@bash scripts/test.sh

### Clean up

Expand Down
5 changes: 2 additions & 3 deletions NOTES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
### Added
- [README] add license badge
- [SCRIPTS] add is_checkout_dirty.sh release.sh tag_release.sh commit_hash.sh
- [CRYPTO] add btcd secp256k1 crypto
### Fixed
- [MAKEFILE] add check fmt tag_release release command
- [MAKEFILE] fixed cross platform

6 changes: 6 additions & 0 deletions cmd/utils/history.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ import "github.com/monax/relic"
// release tagging script: ./scripts/tag_release.sh
var History relic.ImmutableHistory = relic.NewHistory("fractal", "https://github.com/fractalplatform/fractal").
MustDeclareReleases(
"0.0.6 - 2019-04-04",
`### Added
- [CRYPTO] add btcd secp256k1 crypto
### Fixed
- [MAKEFILE] fixed cross platform
`,
"0.0.5 - 2019-04-04",
`### Added
- [README] add license badge
Expand Down

0 comments on commit 1adb3f5

Please sign in to comment.