Switch to Go Modules for dependency management

Keeping every module pinned to the same version as before.
This commit is contained in:
Martin Hebnes Pedersen 2020-05-27 22:57:32 +02:00
parent 0cc1b75abc
commit c8d4ac9835
29 changed files with 104 additions and 117 deletions

View file

@ -6,7 +6,7 @@ clone_folder: c:\gopath\src\github.com\la5nta\pat
environment:
global:
GOPATH: C:\gopath
GOVERSION: "1.13.8"
GOVERSION: "1.14.3"
MSYS_PATH: C:\MinGW\msys\1.0
install:
- set PATH=C:\go\bin;%MSYS_PATH%\bin;C:\MinGW\bin;%PATH%

82
.gitmodules vendored
View file

@ -1,82 +0,0 @@
[submodule "vendor/github.com/mattn/go-runewidth"]
path = vendor/github.com/mattn/go-runewidth
url = https://github.com/mattn/go-runewidth.git
branch = master
[submodule "vendor/github.com/gorhill/cronexpr"]
path = vendor/github.com/gorhill/cronexpr
url = https://github.com/gorhill/cronexpr.git
branch = master
[submodule "vendor/github.com/elazarl/go-bindata-assetfs"]
path = vendor/github.com/elazarl/go-bindata-assetfs
url = https://github.com/elazarl/go-bindata-assetfs.git
branch = master
[submodule "vendor/github.com/gorilla/context"]
path = vendor/github.com/gorilla/context
url = https://github.com/gorilla/context.git
branch = master
[submodule "vendor/github.com/gorilla/websocket"]
path = vendor/github.com/gorilla/websocket
url = https://github.com/gorilla/websocket.git
branch = master
[submodule "vendor/github.com/bndr/gotabulate"]
path = vendor/github.com/bndr/gotabulate
url = https://github.com/bndr/gotabulate.git
branch = master
[submodule "vendor/github.com/gorilla/mux"]
path = vendor/github.com/gorilla/mux
url = https://github.com/gorilla/mux.git
branch = master
[submodule "vendor/github.com/howeyc/gopass"]
path = vendor/github.com/howeyc/gopass
url = https://github.com/howeyc/gopass.git
branch = master
[submodule "vendor/github.com/peterh/liner"]
path = vendor/github.com/peterh/liner
url = https://github.com/peterh/liner.git
branch = master
[submodule "vendor/github.com/spf13/pflag"]
path = vendor/github.com/spf13/pflag
url = https://github.com/spf13/pflag.git
branch = master
[submodule "vendor/github.com/microcosm-cc/bluemonday"]
path = vendor/github.com/microcosm-cc/bluemonday
url = https://github.com/microcosm-cc/bluemonday.git
branch = master
[submodule "vendor/github.com/la5nta/wl2k-go"]
path = vendor/github.com/la5nta/wl2k-go
url = https://github.com/la5nta/wl2k-go
branch = master
[submodule "vendor/golang.org/x/net"]
path = vendor/golang.org/x/net
url = https://go.googlesource.com/net
branch = master
[submodule "vendor/golang.org/x/crypto"]
path = vendor/golang.org/x/crypto
url = https://go.googlesource.com/crypto
branch = master
[submodule "vendor/github.com/jteeuwen/go-bindata"]
path = vendor/github.com/jteeuwen/go-bindata
url = https://github.com/jteeuwen/go-bindata.git
branch = master
[submodule "vendor/golang.org/x/text"]
path = vendor/golang.org/x/text
url = https://go.googlesource.com/text
branch = master
[submodule "vendor/github.com/fsnotify/fsnotify"]
path = vendor/github.com/fsnotify/fsnotify
url = https://github.com/fsnotify/fsnotify.git
[submodule "vendor/golang.org/x/sys"]
path = vendor/golang.org/x/sys
url = https://go.googlesource.com/sys
[submodule "vendor/github.com/nfnt/resize"]
path = vendor/github.com/nfnt/resize
url = https://github.com/nfnt/resize.git
[submodule "vendor/github.com/pd0mz/go-maidenhead"]
path = vendor/github.com/pd0mz/go-maidenhead
url = https://github.com/pd0mz/go-maidenhead.git
[submodule "vendor/github.com/harenber/ptc-go"]
path = vendor/github.com/harenber/ptc-go
url = https://github.com/harenber/ptc-go.git
[submodule "vendor/github.com/tarm/serial"]
path = vendor/github.com/tarm/serial
url = https://github.com/tarm/serial.git

View file

@ -5,18 +5,18 @@ os:
- osx
go:
- "1.10"
- "1.13.8"
- 1.11.x
- 1.x
matrix:
exclude:
- os: osx
go: "1.10"
go: 1.11.x
install:
- git submodule update --init --recursive
- GO111MODULE=on go mod download
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./make.bash libax25; fi
script:
- go vet ./...
- GO111MODULE=on go vet ./...
- ./make.bash

30
go.mod Normal file
View file

@ -0,0 +1,30 @@
module github.com/la5nta/pat
go 1.11
require (
github.com/bndr/gotabulate v1.1.3-0.20170315142410-bc555436bfd5
github.com/elazarl/go-bindata-assetfs v1.0.0
github.com/fsnotify/fsnotify v1.4.7
github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a
github.com/gorilla/context v1.1.1 // indirect
github.com/gorilla/mux v1.6.1
github.com/gorilla/websocket v1.2.1-0.20180201015256-4ac909741dfa
github.com/harenber/ptc-go v2.0.2+incompatible
github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c
github.com/jteeuwen/go-bindata v3.0.8-0.20151023091102-a0ff2567cfb7+incompatible
github.com/la5nta/wl2k-go v0.7.0
github.com/mattn/go-runewidth v0.0.3-0.20170510074858-97311d9f7767 // indirect
github.com/microcosm-cc/bluemonday v0.0.0-20171222152607-542fd4642604
github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5
github.com/paulrosania/go-charset v0.0.0-20151028000031-621bb39fcc83 // indirect
github.com/pd0mz/go-maidenhead v0.0.0-20170221185439-faa09c24425e
github.com/peterh/liner v1.0.1-0.20171122030339-3681c2a91233
github.com/spf13/pflag v1.0.0
github.com/stretchr/testify v1.5.1 // indirect
github.com/tarm/goserial v0.0.0-20151007205400-b3440c3c6355 // indirect
github.com/tarm/serial v0.0.0-20180114052751-eaafced92e96 // indirect
golang.org/x/crypto v0.0.0-20170720175935-691496433715 // indirect
golang.org/x/net v0.0.0-20170721033204-ab5485076ff3 // indirect
golang.org/x/sys v0.0.0-20170721163517-c4489faa6e5a // indirect
)

57
go.sum Normal file
View file

@ -0,0 +1,57 @@
github.com/bndr/gotabulate v1.1.3-0.20170315142410-bc555436bfd5 h1:D48YSLPNJ8WpdwDqYF8bMMKUB2bgdWEiFx1MGwPIdbs=
github.com/bndr/gotabulate v1.1.3-0.20170315142410-bc555436bfd5/go.mod h1:0+8yUgaPTtLRTjf49E8oju7ojpU11YmXyvq1LbPAb3U=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk=
github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a h1:yNuTIQkXLNAevCwQJ7ur3ZPoZPhbvAi6QXhJ/ylX6+8=
github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a/go.mod h1:g2644b03hfBX9Ov0ZBDgXXens4rxSxmqFBbhvKv2yVA=
github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
github.com/gorilla/mux v1.6.1 h1:KOwqsTYZdeuMacU7CxjMNYEKeBvLbxW+psodrbcEa3A=
github.com/gorilla/mux v1.6.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/gorilla/websocket v1.2.1-0.20180201015256-4ac909741dfa h1:hhH/eMQVmq77i5UNR1bX5GGQE5AT/+Xg11kKjMAGYwc=
github.com/gorilla/websocket v1.2.1-0.20180201015256-4ac909741dfa/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/harenber/ptc-go v2.0.2+incompatible h1:uv/jHlv2RbOo0DZsfdWFFwdSdg9Zp7SiULif9DXYV8o=
github.com/harenber/ptc-go v2.0.2+incompatible/go.mod h1:AoWDyvM2qfCIDkkDfd/XRfKB5Vglv7e/jMZ01j0PIxQ=
github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c h1:kQWxfPIHVLbgLzphqk3QUflDy9QdksZR4ygR807bpy0=
github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs=
github.com/jteeuwen/go-bindata v3.0.8-0.20151023091102-a0ff2567cfb7+incompatible h1:KTM14h3AKWWcPf5IWS/pcFTZosRmoqdIYzqi0mMG7es=
github.com/jteeuwen/go-bindata v3.0.8-0.20151023091102-a0ff2567cfb7+incompatible/go.mod h1:JVvhzYOiGBnFSYRyV00iY8q7/0PThjIYav1p9h5dmKs=
github.com/la5nta/wl2k-go v0.7.0 h1:Ru79CVHHbdc9ySGo/h9ogtTeqj9r8XLz6ojDw6T3NBQ=
github.com/la5nta/wl2k-go v0.7.0/go.mod h1:pjcB/ZrcHi02Ak9mxWRnjvrvuFPO9BaiP2jZqRqk2uY=
github.com/mattn/go-runewidth v0.0.3-0.20170510074858-97311d9f7767 h1:/Df5WsCmjFyY0AT2fgEvlF2fHQ6sWyuRzgYXvgSh4ec=
github.com/mattn/go-runewidth v0.0.3-0.20170510074858-97311d9f7767/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
github.com/microcosm-cc/bluemonday v0.0.0-20171222152607-542fd4642604 h1:BbG6VMVavjbhIsD7Hoscfz+wExp1hY+pmk+7Agc4J74=
github.com/microcosm-cc/bluemonday v0.0.0-20171222152607-542fd4642604/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5 h1:BvoENQQU+fZ9uukda/RzCAL/191HHwJA5b13R6diVlY=
github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
github.com/paulrosania/go-charset v0.0.0-20151028000031-621bb39fcc83 h1:XQonH5Iv5rbyIkMJOQ4xKmKHQTh8viXtRSmep5Ca5I4=
github.com/paulrosania/go-charset v0.0.0-20151028000031-621bb39fcc83/go.mod h1:YnNlZP7l4MhyGQ4CBRwv6ohZTPrUJJZtEv4ZgADkbs4=
github.com/pd0mz/go-maidenhead v0.0.0-20170221185439-faa09c24425e h1:Wi4WahFJ11u42ofsl3BdI7y7TiAoCH4yDXei/IQuAzw=
github.com/pd0mz/go-maidenhead v0.0.0-20170221185439-faa09c24425e/go.mod h1:4Q+QSDCqWqlabstLGUVm47rAcL06nEEty2d3KzsTNMk=
github.com/peterh/liner v1.0.1-0.20171122030339-3681c2a91233 h1:jmJndGFBPjNWW+MAYarU/Nl8QrQVzbw4B/AYE0LzETo=
github.com/peterh/liner v1.0.1-0.20171122030339-3681c2a91233/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/spf13/pflag v1.0.0 h1:oaPbdDe/x0UncahuwiPxW1GYJyilRAdsPnq3e1yaPcI=
github.com/spf13/pflag v1.0.0/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/tarm/goserial v0.0.0-20151007205400-b3440c3c6355 h1:Kp3kg8YL2dc75mckomrHZQTfzNyFGnaqFhJeQw4ozGc=
github.com/tarm/goserial v0.0.0-20151007205400-b3440c3c6355/go.mod h1:jcMo2Odv5FpDA6rp8bnczbUolcICW6t54K3s9gOlgII=
github.com/tarm/serial v0.0.0-20180114052751-eaafced92e96 h1:pLss0TM/G46eE2p8NIRYIlB12vrPvWXiqDoCKA52wwQ=
github.com/tarm/serial v0.0.0-20180114052751-eaafced92e96/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
golang.org/x/crypto v0.0.0-20170720175935-691496433715 h1:fAitKEIRjdAxgeKpqWrLfuNeJhHOFT2lkfHkHwqEsmM=
golang.org/x/crypto v0.0.0-20170720175935-691496433715/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/net v0.0.0-20170721033204-ab5485076ff3 h1:ech7AnQSc0Co690VXugI2YBicKHJwkjZJKaa76BGG84=
golang.org/x/net v0.0.0-20170721033204-ab5485076ff3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/sys v0.0.0-20170721163517-c4489faa6e5a h1:8KvbXgrIMDssOA6vHwmODQ7KZgoDdlu3fhUPtHXbEEY=
golang.org/x/sys v0.0.0-20170721163517-c4489faa6e5a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

View file

@ -29,6 +29,9 @@ import (
"github.com/la5nta/wl2k-go/catalog"
"github.com/la5nta/wl2k-go/fbb"
"github.com/la5nta/wl2k-go/mailbox"
_ "github.com/elazarl/go-bindata-assetfs"
_ "github.com/jteeuwen/go-bindata"
)
// Status represents a status report as sent to the Web GUI
@ -58,8 +61,10 @@ type Notification struct {
var websocketHub *WSHub
//go:generate go install -v ./vendor/github.com/jteeuwen/go-bindata/go-bindata ./vendor/github.com/elazarl/go-bindata-assetfs/go-bindata-assetfs
//go:generate go-bindata-assetfs res/...
//go:generate mkdir -p .build
//go:generate go build -v -o .build/go-bindata-assetfs github.com/elazarl/go-bindata-assetfs/go-bindata-assetfs
//go:generate go build -v -o .build/go-bindata github.com/jteeuwen/go-bindata/go-bindata
//go:generate sh -c "PATH=\"$PATH:.build/\" go-bindata-assetfs res/..."
func ListenAndServe(addr string) error {
log.Printf("Starting HTTP service (%s)...", addr)

View file

@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -e
export GO15VENDOREXPERIMENT=1
export GO111MODULE=on
if [ -d $GOOS ]; then OS=$(go env GOOS); else OS=$GOOS; fi
@ -43,12 +43,11 @@ if [[ "$OS" == "linux"* ]]; then
fi
fi
# Update submodules (dependencies)
echo -e "Updating git submodules..."
git submodule update --init --recursive
echo -e "Downloading Go dependencies..."
go mod download
echo "Running tests..."
go test -tags "$TAGS" `go list ./...|grep -v vendor` `go list ./...|grep wl2k-go|egrep -v '/vendor/.*/vendor/'`
go test -tags "$TAGS" ./... github.com/la5nta/wl2k-go/...
echo
echo "Building Pat v$VERSION..."

1
vendor/github.com/bndr/gotabulate generated vendored

@ -1 +0,0 @@
Subproject commit bc555436bfd5d4e93a2dd35b462ce37e067afdda

@ -1 +0,0 @@
Subproject commit 30f82fa23fd844bd5bb1e5f216db87fd77b5eb43

@ -1 +0,0 @@
Subproject commit c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9

1
vendor/github.com/gorhill/cronexpr generated vendored

@ -1 +0,0 @@
Subproject commit d520615e531a6bf3fb69406b9eba718261285ec8

1
vendor/github.com/gorilla/context generated vendored

@ -1 +0,0 @@
Subproject commit 08b5f424b9271eedf6f9f0ce86cb9396ed337a42

1
vendor/github.com/gorilla/mux generated vendored

@ -1 +0,0 @@
Subproject commit 53c1911da2b537f792e7cafcb446b05ffe33b996

@ -1 +0,0 @@
Subproject commit 4ac909741dfa57448bfadfdbca0cf7eeaa68f0e2

1
vendor/github.com/harenber/ptc-go generated vendored

@ -1 +0,0 @@
Subproject commit a9e155cce99847dfc360d27eed1d6dca8238afb9

1
vendor/github.com/howeyc/gopass generated vendored

@ -1 +0,0 @@
Subproject commit bf9dde6d0d2c004a008c27aaee91170c786f6db8

@ -1 +0,0 @@
Subproject commit a0ff2567cfb70903282db057e799fd826784d41d

1
vendor/github.com/la5nta/wl2k-go generated vendored

@ -1 +0,0 @@
Subproject commit 2ac60b90dfa07c506807347b2812535ab3d4feba

@ -1 +0,0 @@
Subproject commit 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d

@ -1 +0,0 @@
Subproject commit 542fd4642604d0d0c26112396ce5b1a9d01eee0b

1
vendor/github.com/nfnt/resize generated vendored

@ -1 +0,0 @@
Subproject commit 891127d8d1b52734debe1b3c3d7e747502b6c366

@ -1 +0,0 @@
Subproject commit faa09c24425e9d864151ac105e77ff6cab005013

1
vendor/github.com/peterh/liner generated vendored

@ -1 +0,0 @@
Subproject commit 3681c2a912330352991ecdd642f257efe5b85518

1
vendor/github.com/spf13/pflag generated vendored

@ -1 +0,0 @@
Subproject commit e57e3eeb33f795204c1ca35f56c44f83227c6e66

1
vendor/github.com/tarm/serial generated vendored

@ -1 +0,0 @@
Subproject commit eaafced92e9619f03c72527efeab21e326f3bc36

1
vendor/golang.org/x/crypto generated vendored

@ -1 +0,0 @@
Subproject commit 6914964337150723782436d56b3f21610a74ce7b

1
vendor/golang.org/x/net generated vendored

@ -1 +0,0 @@
Subproject commit ab5485076ff3407ad2d02db054635913f017b0ed

1
vendor/golang.org/x/sys generated vendored

@ -1 +0,0 @@
Subproject commit c4489faa6e5ab84c0ef40d6ee878f7a030281f0f

1
vendor/golang.org/x/text generated vendored

@ -1 +0,0 @@
Subproject commit 836efe42bb4aa16aaa17b9c155d8813d336ed720