From c7098406d00bf0bd74a5df39598ecfb6ea677af3 Mon Sep 17 00:00:00 2001 From: Chris F Ravenscroft Date: Wed, 20 Oct 2021 10:52:01 -0700 Subject: [PATCH] Update CI to forget about bindata --- .github/workflows/ci.yml | 6 ++---- .gitignore | 2 -- Dockerfile-plugins | 6 +----- Dockerfile-standalone | 6 +----- README.md | 5 ----- go.mod | 8 ++++---- go.sum | 5 ----- 7 files changed, 8 insertions(+), 30 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c383f0e..859a48b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - go-version: [1.15.x, 1.16.x] + go-version: [1.16.x, 1.17.x] steps: - name: Install Go uses: actions/setup-go@v2 @@ -19,11 +19,9 @@ jobs: - name: Updating packages database run: sudo apt-get -qq update - name: Install CLI Dependencies - run: sudo apt-get install -y ldap-utils oathtool go-bindata + run: sudo apt-get install -y ldap-utils oathtool - name: Checkout code uses: actions/checkout@v2 - - name: Make Bindata - run: make bindata - name: Fetch Go dependencies run: go get -t -v ./... - name: Fail if a .go file hasn't been formatted with 'go fmt' diff --git a/.gitignore b/.gitignore index 795bad1..8289cba 100644 --- a/.gitignore +++ b/.gitignore @@ -10,8 +10,6 @@ certs/ # Built binaries bin -pkg/assets/bindata.go - .*.swp certs/ diff --git a/Dockerfile-plugins b/Dockerfile-plugins index 311ca12..47c482c 100644 --- a/Dockerfile-plugins +++ b/Dockerfile-plugins @@ -17,11 +17,7 @@ ENV GOARCH=amd64 ENV GO_ENABLED=1 # Only needed for alpine builds // also: busybox -RUN apt -qq update && apt -qq install -y git make go-bindata build-essential busybox-static dumb-init - -# Run go-bindata to embed data for API -RUN go-bindata -pkg=assets -o=pkg/assets/bindata.go assets -RUN gofmt -w pkg/assets/bindata.go +RUN apt -qq update && apt -qq install -y git make build-essential busybox-static dumb-init # Install deps RUN go get -d -v ./... diff --git a/Dockerfile-standalone b/Dockerfile-standalone index 780bd6d..afb850d 100644 --- a/Dockerfile-standalone +++ b/Dockerfile-standalone @@ -17,11 +17,7 @@ ENV GOARCH=amd64 ENV CGO_ENABLED=0 # Only needed for alpine builds // also: busybox -RUN apk add --no-cache git make go-bindata busybox-static dumb-init - -# Run go-bindata to embed data for API -RUN go-bindata -pkg=assets -o=pkg/assets/bindata.go assets -RUN gofmt -w pkg/assets/bindata.go +RUN apk add --no-cache git make busybox-static dumb-init # Install deps RUN go get -d -v ./... diff --git a/README.md b/README.md index 1e509e8..d43412d 100644 --- a/README.md +++ b/README.md @@ -268,11 +268,6 @@ A small note about other architectures: while I expect the code is, for the most We will accept PRs which fix bugs on these platforms, but be aware these binaries will not be tested regularly, and instead are provided for the convenience of those who feel comfortable with this. ### Building: -You'll need go-bindata to build GLAuth. Then use the Makefile. -```unix -go get github.com/jteeuwen/go-bindata/... -make all -``` # Logging - using logr with increasing verbosity diff --git a/go.mod b/go.mod index 4265a08..95788a4 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,9 @@ go 1.16 require ( github.com/GeertJohan/yubigo v0.0.0-20190917122436-175bc097e60e - github.com/arl/statsviz v0.4.0 // indirect - github.com/boombuler/barcode v1.0.1 - github.com/davecgh/go-spew v1.1.1 + github.com/arl/statsviz v0.4.0 + github.com/boombuler/barcode v1.0.1 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 github.com/fsnotify/fsnotify v1.4.9 github.com/go-logr/logr v0.4.0 @@ -18,7 +18,7 @@ require ( github.com/nmcclain/ldap v0.0.0-20210720162743-7f8d1e44eeba github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 github.com/pquerna/otp v1.3.0 - github.com/smartystreets/goconvey v1.6.4 // indirect + github.com/smartystreets/goconvey v1.6.4 github.com/yaegashi/msgraph.go v0.1.1-0.20200221123608-2d438cf2a7cc golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 gopkg.in/amz.v3 v3.0.0-20201001071545-24fc1eceb27b diff --git a/go.sum b/go.sum index 6a4dc63..4050561 100644 --- a/go.sum +++ b/go.sum @@ -3,7 +3,6 @@ github.com/GeertJohan/yubigo v0.0.0-20190917122436-175bc097e60e h1:Bqtt5C+uVk+vH github.com/GeertJohan/yubigo v0.0.0-20190917122436-175bc097e60e/go.mod h1:njRCDrl+1RQ/A/+KVU8Ho2EWAxUSkohOWczdW3dzDG0= github.com/arl/statsviz v0.4.0 h1:pv8DWfti0TC8M2Baold2xGnCnir9jhqv1BO6UNKQmqY= github.com/arl/statsviz v0.4.0/go.mod h1:+5inUy/dxy11x/KSmicG3ZrEEy0Yr81AFm3dn4QC04M= -github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.1 h1:NDBbPmhS+EqABEs5Kg3n/5ZNjy73Pz7SIV+KCeqyXcs= github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= @@ -28,8 +27,6 @@ github.com/hydronica/toml v0.4.2 h1:BY+iAvyl2u1BlfgkJQzqc1UXDGLWfpMmOWuqJrwAVDU= github.com/hydronica/toml v0.4.2/go.mod h1:c7QhbYq3Wp9SlOWuG7MAieKUyXP2P/hXhy/YqWfbS/4= github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a h1:zPPuIq2jAWWPTrGt70eK/BSch+gFAGrNzecsoENgu2o= github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a/go.mod h1:yL958EeXv8Ylng6IfnvG4oflryUi3vgA3xPs9hmII1s= -github.com/jteeuwen/go-bindata v3.0.7+incompatible h1:91Uy4d9SYVr1kyTJ15wJsog+esAZZl7JmEfTkwmhJts= -github.com/jteeuwen/go-bindata v3.0.7+incompatible/go.mod h1:JVvhzYOiGBnFSYRyV00iY8q7/0PThjIYav1p9h5dmKs= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= @@ -70,7 +67,6 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9 h1:L2auWcuQIvxz9xSEqzESnV/QN/gNRXNApHi3fYwl2w0= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= @@ -79,7 +75,6 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 h1:TFlARGu6Czu1z7q93HTxcP1P+/ZFC/IKythI5RzrnRg= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= gopkg.in/amz.v3 v3.0.0-20201001071545-24fc1eceb27b h1:tdSyAzD5FHJmZAZ13d5WexAo7YJkiyGphhzFfInMnDw=