Skip to content

Commit

Permalink
New org
Browse files Browse the repository at this point in the history
  • Loading branch information
kevgo committed Apr 25, 2020
1 parent d1e9a2e commit 244819c
Show file tree
Hide file tree
Showing 130 changed files with 531 additions and 537 deletions.
16 changes: 8 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Git Town is a welcoming community, and we'd love for everyone to bring their
contributions of any size to make it even better.

- Found a bug or have an idea for a new feature? -
[Open an issue](https://github.com/Originate/git-town/issues/new)
[Open an issue](https://github.com/git-town/git-town/issues/new)
- Fixed a bug or created a new feature that others will enjoy? -
[Create a pull request](https://help.github.com/articles/using-pull-requests/)

Expand All @@ -25,10 +25,10 @@ when developing Git Town.
- set the environment variable `$GOPATH` to your Go workspace (you can point
it to any folder on your hard drive, let's assume `~/go` here)
- add `~/go/bin` to your `$PATH`
- create the directory `~/go/src/github.com/Originate`
- create the directory `~/go/src/github.com/git-town`
- cd into that directory, and run
`git clone [email protected]:Originate/git-town.git`
- cd into `$GOPATH/src/github.com/Originate/git-town`
`git clone [email protected]:git-town/git-town.git`
- cd into `$GOPATH/src/github.com/git-town/git-town`
- make sure you have `make` - Mac and Linux users should be okay, Windows users
should install
[Make for Windows](http://gnuwin32.sourceforge.net/packages/make.htm)
Expand All @@ -37,8 +37,8 @@ when developing Git Town.
- now you can run `git-town` on the command line
- see https://golang.org/doc/install#testing for details on how to test
- optionally install
[Tertestrial](https://github.com/Originate/tertestrial-server) for
auto-running tests
[Tertestrial](https://github.com/git-town/tertestrial-server) for auto-running
tests
- optionally install [scc](https://github.com/boyter/scc) to see code statistics
via <code textrun="verify-make-command">make stats</code>

Expand Down Expand Up @@ -117,7 +117,7 @@ Please follow the existing code style.

Each pull request (PR) should have the same (optional) description that it will
have when committed later and include the
[issue](https://github.com/Originate/git-town/issues) it resolves.
[issue](https://github.com/git-town/git-town/issues) it resolves.

When merging approved PRs:

Expand All @@ -140,7 +140,7 @@ Implements #123

## Release Process

#### Originate/git-town
#### git-town/git-town

- Create a feature branch which updates `RELEASE_NOTES.md`
- Get the feature branch reviewed and merged
Expand Down
3 changes: 1 addition & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014-2018 Originate
Copyright (c) 2014-2018 the Git Town creators

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
date := $(shell TZ=UTC date -u '+%Y-%m-%d')

build: # builds for the current platform
go install -ldflags "-X github.com/Originate/git-town/src/cmd.version=v0.0.0-test -X github.com/Originate/git-town/src/cmd.buildDate=today"
go install -ldflags "-X github.com/git-town/git-town/src/cmd.version=v0.0.0-test -X github.com/git-town/git-town/src/cmd.buildDate=today"

build-release: cross-compile # builds the artifacts for a new release
package/debian/make_deb.sh

cross-compile: # builds the binary for all platforms
go get github.com/mitchellh/gox
gox -ldflags "-X github.com/Originate/git-town/src/cmd.version=${TRAVIS_TAG} -X github.com/Originate/git-town/src/cmd.buildDate=${date}" \
gox -ldflags "-X github.com/git-town/git-town/src/cmd.version=${TRAVIS_TAG} -X github.com/git-town/git-town/src/cmd.buildDate=${date}" \
-output "dist/{{.Dir}}-${TRAVIS_TAG}-{{.OS}}-{{.Arch}}"

cuke: cuke-go cuke-ruby # runs the feature tests
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
![Git Town](https://originate.github.io/git-town/documentation/logo-horizontal.svg)
![Git Town](https://git-town.github.io/git-town/documentation/logo-horizontal.svg)

[![Build Status](https://travis-ci.org/Originate/git-town.svg?branch=master)](https://travis-ci.org/Originate/git-town)
[![Go Report Card](https://goreportcard.com/badge/github.com/Originate/git-town)](https://goreportcard.com/report/github.com/Originate/git-town)
[![Build Status](https://travis-ci.org/git-town/git-town.svg?branch=master)](https://travis-ci.org/git-town/git-town)
[![Go Report Card](https://goreportcard.com/badge/github.com/git-town/git-town)](https://goreportcard.com/report/github.com/git-town/git-town)
[![License](https://img.shields.io/:license-MIT-blue.svg?style=flat)](LICENSE)
[![Help Contribute to Open Source](https://www.codetriage.com/originate/git-town/badges/users.svg)](https://www.codetriage.com/originate/git-town)

Expand Down Expand Up @@ -136,7 +136,7 @@ command line for an overview of the Git Town commands, or `git help <command>`
## Contributing

Found a bug or have an idea for a new feature?
[Open an issue](https://github.com/Originate/git-town/issues/new) or - even
[Open an issue](https://github.com/git-town/git-town/issues/new) or - even
better - get down, go to town, and fire a feature-tested
[pull request](https://help.github.com/articles/using-pull-requests/) our way!
Check out our [contributing guide](/CONTRIBUTING.md) to start coding.
Loading

0 comments on commit 244819c

Please sign in to comment.