diff --git a/.travis.yml b/.travis.yml index ac2e5937..4f165b63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - "1.13.x" + - "1.14rc1" script: - make diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index 39b284c7..00000000 --- a/Gopkg.lock +++ /dev/null @@ -1,233 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - branch = "master" - digest = "1:805d31e8de22d8be01b05e29eb3d1a02e512c9d437724372afe3e9cd45a1cf87" - name = "code.cloudfoundry.org/bytefmt" - packages = ["."] - pruneopts = "UT" - revision = "854d396b647c90b5a45646f9dcc2c9cd08ea8d51" - -[[projects]] - branch = "master" - digest = "1:289fa52f4d9e9c817a003324bc14e9339b996dbe02b9f6cfc57a9383e5365287" - name = "github.com/docopt/docopt-go" - packages = ["."] - pruneopts = "UT" - revision = "ee0de3bc6815ee19d4a46c7eb90f829db0e014b1" - -[[projects]] - branch = "master" - digest = "1:148948635cfd8724af31d43ed024dac11c2b87c27a2a3eeb6c04e7360ab56366" - name = "github.com/goshuirc/e-nfa" - packages = ["."] - pruneopts = "UT" - revision = "7071788e394065e6456458a5e9cb503cad545154" - -[[projects]] - branch = "master" - digest = "1:97259f42662dc7333186fea039a1dde8d88695f487a937cc3ebd134c6adaacaf" - name = "github.com/goshuirc/irc-go" - packages = [ - "ircfmt", - "ircmatch", - "ircmsg", - ] - pruneopts = "UT" - revision = "05ecc95249a0431980388ab092eaebca4c62fab9" - -[[projects]] - digest = "1:4a29eeb25603debe8f2098a9902c4d3851034cf70d33be428826e86e8c30a1b0" - name = "github.com/mattn/go-colorable" - packages = ["."] - pruneopts = "UT" - revision = "98ec13f34aabf44cc914c65a1cfb7b9bc815aef1" - version = "v0.1.4" - -[[projects]] - digest = "1:d62282425ffb75047679d7e2c3b980eea7f82c05ef5fb9142ee617ebac6e7432" - name = "github.com/mattn/go-isatty" - packages = ["."] - pruneopts = "UT" - revision = "88ba11cfdc67c7588b30042edf244b2875f892b6" - version = "v0.0.10" - -[[projects]] - branch = "master" - digest = "1:2b32af4d2a529083275afc192d1067d8126b578c7a9613b26600e4df9c735155" - name = "github.com/mgutz/ansi" - packages = ["."] - pruneopts = "UT" - revision = "9520e82c474b0a04dd04f8a40959027271bab992" - -[[projects]] - digest = "1:e7de6e4830c9d4fe1463c09a2ee15ec3eb9455c2ea916044675c413e8a9c6608" - name = "github.com/oragono/confusables" - packages = ["."] - pruneopts = "UT" - revision = "fe1cf31a24b01cac37194669863df51713e08e54" - -[[projects]] - branch = "master" - digest = "1:2251e6a17ea4a6eaa708882a1cda837aae3e425edbb190ef39b761ecf15a5c3d" - name = "github.com/oragono/go-ident" - packages = ["."] - pruneopts = "UT" - revision = "337fed0fd21ad538725cfcb55053ea4cf8056abc" - -[[projects]] - branch = "master" - digest = "1:75b14229739123696e5b75bdba078011229baf8f606362f3771cc6a861cefe67" - name = "github.com/tidwall/btree" - packages = ["."] - pruneopts = "UT" - revision = "400434d76274d2bd5d2d8297d7d67f35a54fd5a0" - -[[projects]] - digest = "1:f578aad894f832b60b752800c9c43a7c8e56229d4470d2a292871792ba7fb02b" - name = "github.com/tidwall/buntdb" - packages = ["."] - pruneopts = "UT" - revision = "eeb4b0a11d5828f744ffa39c652a5a24864be4b0" - version = "v1.1.2" - -[[projects]] - digest = "1:5a68167017eaa32aa408397806b9d69815244238ed774439a8863ef4bc329eeb" - name = "github.com/tidwall/gjson" - packages = ["."] - pruneopts = "UT" - revision = "c34bf81952c067718854115564f8e55978be5e1d" - version = "v1.3.4" - -[[projects]] - branch = "master" - digest = "1:403222dac436240f4a747c4ced09c1d5884082d920f151ea6c19abf7a75d4e7c" - name = "github.com/tidwall/grect" - packages = ["."] - pruneopts = "UT" - revision = "ba9a043346eba55344e40d66a5e74cfda3a9d293" - -[[projects]] - digest = "1:8453ddbed197809ee8ca28b06bd04e127bec9912deb4ba451fea7a1eca578328" - name = "github.com/tidwall/match" - packages = ["."] - pruneopts = "UT" - revision = "33827db735fff6510490d69a8622612558a557ed" - version = "v1.0.1" - -[[projects]] - digest = "1:ddfe0a54e5f9b29536a6d7b2defa376f2cb2b6e4234d676d7ff214d5b097cb50" - name = "github.com/tidwall/pretty" - packages = ["."] - pruneopts = "UT" - revision = "1166b9ac2b65e46a43d8618d30d1554f4652d49b" - version = "v1.0.0" - -[[projects]] - branch = "master" - digest = "1:54fec16397c72e6ecb5e61309e369517d4ea7aaee4d97454c36075539039ad85" - name = "github.com/tidwall/rtree" - packages = [ - ".", - "base", - ] - pruneopts = "UT" - revision = "6cd427091e0e662cb4f8e2c9eb1a41e1c46ff0d3" - -[[projects]] - branch = "master" - digest = "1:1b885e925ee7c05565b3178a4fa818bf33885878344d8629ac433a5db99d58e4" - name = "github.com/tidwall/tinyqueue" - packages = ["."] - pruneopts = "UT" - revision = "1e39f55115634cad2c504631c8bfcc292f2c9c55" - -[[projects]] - branch = "master" - digest = "1:ee7263bc4399e2ed4f28e3c9c2e661218d427e4e4e4501748080aae41e6942ba" - name = "golang.org/x/crypto" - packages = [ - "bcrypt", - "blowfish", - "sha3", - "ssh/terminal", - ] - pruneopts = "UT" - revision = "e1110fd1c708ef015366ea01799a23c459593c47" - -[[projects]] - branch = "master" - digest = "1:5d507fb4c4f49b851691887afc8a5a547634186965f85209cc1f25a3ab6a6c57" - name = "golang.org/x/sys" - packages = [ - "cpu", - "unix", - "windows", - ] - pruneopts = "UT" - revision = "52ab431487773bc9dd1b0766228b1cf3944126bf" - -[[projects]] - digest = "1:5f1559c4cee44069f81517430ebba19589869f3d4d4648213a4d5ddd199b11d8" - name = "golang.org/x/text" - packages = [ - "cases", - "collate", - "collate/build", - "internal", - "internal/colltab", - "internal/gen", - "internal/language", - "internal/language/compact", - "internal/tag", - "internal/triegen", - "internal/ucd", - "language", - "runes", - "secure/bidirule", - "secure/precis", - "transform", - "unicode/bidi", - "unicode/cldr", - "unicode/norm", - "unicode/rangetable", - "width", - ] - pruneopts = "UT" - revision = "342b2e1fbaa52c93f31447ad2c6abc048c63e475" - version = "v0.3.2" - -[[projects]] - digest = "1:f26a5d382387e03a40d1471dddfba85dfff9bf05352d7e42d37612677c4d3c5c" - name = "gopkg.in/yaml.v2" - packages = ["."] - pruneopts = "UT" - revision = "f90ceb4f409096b60e2e9076b38b304b8246e5fa" - version = "v2.2.5" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "code.cloudfoundry.org/bytefmt", - "github.com/docopt/docopt-go", - "github.com/goshuirc/irc-go/ircfmt", - "github.com/goshuirc/irc-go/ircmatch", - "github.com/goshuirc/irc-go/ircmsg", - "github.com/mattn/go-colorable", - "github.com/mgutz/ansi", - "github.com/oragono/confusables", - "github.com/oragono/go-ident", - "github.com/tidwall/buntdb", - "golang.org/x/crypto/bcrypt", - "golang.org/x/crypto/sha3", - "golang.org/x/crypto/ssh/terminal", - "golang.org/x/text/cases", - "golang.org/x/text/language", - "golang.org/x/text/secure/precis", - "golang.org/x/text/width", - "gopkg.in/yaml.v2", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index 88e2ec04..00000000 --- a/Gopkg.toml +++ /dev/null @@ -1,74 +0,0 @@ -# Gopkg.toml example -# -# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html -# for detailed Gopkg.toml documentation. -# -# required = ["github.com/user/thing/cmd/thing"] -# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# -# [[constraint]] -# name = "github.com/user/project" -# version = "1.0.0" -# -# [[constraint]] -# name = "github.com/user/project2" -# branch = "dev" -# source = "github.com/myfork/project2" -# -# [[override]] -# name = "github.com/x/y" -# version = "2.4.0" -# -# [prune] -# non-go = false -# go-tests = true -# unused-packages = true - - -[[constraint]] - branch = "master" - name = "code.cloudfoundry.org/bytefmt" - -[[constraint]] - name = "github.com/docopt/docopt-go" - branch = "master" - -[[constraint]] - branch = "master" - name = "github.com/goshuirc/irc-go" - -[[constraint]] - name = "github.com/mattn/go-colorable" - version = "0.1.2" - -[[constraint]] - branch = "master" - name = "github.com/mgutz/ansi" - -[[constraint]] - branch = "master" - name = "github.com/oragono/go-ident" - -[[constraint]] - revision = "fe1cf31a24b01cac37194669863df51713e08e54" - name = "github.com/oragono/confusables" - -[[constraint]] - name = "github.com/tidwall/buntdb" - version = "1.0.0" - -[[constraint]] - branch = "master" - name = "golang.org/x/crypto" - -[[constraint]] - name = "golang.org/x/text" - version = "0.3.0" - -[[constraint]] - name = "gopkg.in/yaml.v2" - version = "2.2.1" - -[prune] - go-tests = true - unused-packages = true diff --git a/Makefile b/Makefile index 4aaf1fc7..3a2fa6ce 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,14 @@ -.PHONY: all install release capdefs deps test +.PHONY: all install build release capdefs deps test capdef_file = ./irc/caps/defs.go all: install install: deps - ./install.sh + go install -v + +build: deps + go build -v release: deps goreleaser --skip-publish --rm-dist diff --git a/README.md b/README.md index 7fd0eb34..82dd9975 100644 --- a/README.md +++ b/README.md @@ -74,19 +74,7 @@ The `stable` branch contains the latest release. You can run this for a producti #### Building -You'll need an [up-to-date distribution of the Go language for your OS and architecture](https://golang.org/dl/). You'll also need to set up a [Go workspace](https://golang.org/doc/code.html). Typically, this is just a directory `~/go`, with the `GOPATH` environment variable exported to its path with `export GOPATH=~/go`. - -Clone the repository where `go` expects it to be and then run `make`, i.e., - -```bash -mkdir -p ${GOPATH}/src/github.com/oragono -cd ${GOPATH}/src/github.com/oragono -git clone https://github.com/oragono/oragono -cd oragono -# check out the appropriate branch if necessary -# now, this will install a development copy of oragono at ${GOPATH}/bin/oragono: -make -```` +You'll need an [up-to-date distribution of the Go language for your OS and architecture](https://golang.org/dl/). Once you have that, just clone the repository and run `make build`. If everything goes well, you should now have an executable named `oragono` in the base directory of the project. ## Configuration diff --git a/go.mod b/go.mod new file mode 100644 index 00000000..da6146a2 --- /dev/null +++ b/go.mod @@ -0,0 +1,27 @@ +module github.com/oragono/oragono + +go 1.14 + +require ( + code.cloudfoundry.org/bytefmt v0.0.0-20190819182555-854d396b647c + github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 + github.com/goshuirc/e-nfa v0.0.0-20160917075329-7071788e3940 // indirect + github.com/goshuirc/irc-go v0.0.0-20190713001546-05ecc95249a0 + github.com/mattn/go-colorable v0.1.4 + github.com/mattn/go-isatty v0.0.10 // indirect + github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b + github.com/oragono/confusables v0.0.0-20190624102032-fe1cf31a24b0 + github.com/oragono/go-ident v0.0.0-20170110123031-337fed0fd21a + github.com/tidwall/btree v0.0.0-20191029221954-400434d76274 // indirect + github.com/tidwall/buntdb v1.1.2 + github.com/tidwall/gjson v1.3.4 // indirect + github.com/tidwall/grect v0.0.0-20161006141115-ba9a043346eb // indirect + github.com/tidwall/match v1.0.1 // indirect + github.com/tidwall/pretty v1.0.0 // indirect + github.com/tidwall/rtree v0.0.0-20180113144539-6cd427091e0e // indirect + github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563 // indirect + golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708 + golang.org/x/sys v0.0.0-20191115151921-52ab43148777 // indirect + golang.org/x/text v0.3.2 + gopkg.in/yaml.v2 v2.2.5 +) diff --git a/install.sh b/install.sh deleted file mode 100755 index 50dc9bd9..00000000 --- a/install.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -set -e - -if [ -z "$GOPATH" ]; then - echo Error: \$GOPATH is unset - echo See https://golang.org/doc/code.html for details, or try these steps: - printf "\tmkdir -p ~/go\n" - printf "\texport GOPATH=~/go\n" - exit 1 -fi - -EXPECTED_DIR=${GOPATH}/src/github.com/oragono/oragono - -if [ "$PWD" != "$EXPECTED_DIR" ] ; then - echo Error: working directory is not where \$GOPATH expects it to be - echo "Expected: $EXPECTED_DIR" - echo "Actual: $PWD" - echo See https://golang.org/doc/code.html for details, or try these steps: - printf "\tmkdir -p %s/src/github.com/oragono\n" "$GOPATH" - printf "\tcd %s/src/github.com/oragono\n" "$GOPATH" - printf "\tmv %s oragono\n" "$PWD" - printf "\tcd oragono\n" - exit 1 -fi - -go install -v -echo successfully installed as "${GOPATH}/bin/oragono" diff --git a/vendor b/vendor index 153e95cc..269a9c04 160000 --- a/vendor +++ b/vendor @@ -1 +1 @@ -Subproject commit 153e95cc6a79ba6bcf179676214b11e74b883e16 +Subproject commit 269a9c041579d103a1cab3ca989174e63040a7c9