Skip to content

Commit

Permalink
Update Go version recommendation
Browse files Browse the repository at this point in the history
- Update README
  - to direct reader to this project's go.mod file for the preferred
    Go version
  - to use reflinks vs hard-coded values
  - link to official supported Go versions documentation
- Update `go.mod` file to reflect Go 1.17
- Update Dependabot (`dependabot.yml`) configuration to ignore Go
  versions greater than or less than 1.17.x
- Update "canary" Dockerfile to reflect Go 1.17.5, the prior version
  in the 1.17.x series
  - opting to use "one version back" in order to confirm that
    Dependabot picks up the changes as intended
- Run `go mod tidy && go mod vendor`
  - updates format of go.mod to list project dependencies in separate
    direct and transitive require blocks
  - prunes go.mod, go.sum files from vendored dependencies
  - updates format of vendor/modules.txt to note specific version of
    Go used by vendored dependencies

refs GH-107
  • Loading branch information
atc0005 committed Jan 25, 2022
1 parent 5397410 commit 462ca53
Show file tree
Hide file tree
Showing 17 changed files with 52 additions and 215 deletions.
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,5 @@ updates:
versions:
# Ignore updates from series associated with the latest "stable"
# Go release and no longer supported Go versions.
- ">= 1.17"
- "< 1.16"
- ">= 1.18"
- "< 1.17"
33 changes: 21 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ Go-based tooling for monitoring and troubleshooting LOCKSS nodes.
- [Known Issues](#known-issues)
- [Changelog](#changelog)
- [Requirements](#requirements)
- [How to install it](#how-to-install-it)
- [Building source code](#building-source-code)
- [Running](#running)
- [Installation](#installation)
- [From source](#from-source)
- [Using release binaries](#using-release-binaries)
- [Configuration](#configuration)
Expand All @@ -38,9 +40,8 @@ Go-based tooling for monitoring and troubleshooting LOCKSS nodes.

## Project home

See [our GitHub repo](https://github.com/atc0005/go-lockss) for the latest code,
to file an issue or submit improvements for review and potential inclusion
into the project.
See [our GitHub repo][repo-url] for the latest code, to file an issue or
submit improvements for review and potential inclusion into the project.

## Overview

Expand Down Expand Up @@ -87,21 +88,29 @@ official release is also provided for further review.

## Requirements

- Go 1.13+ (for building)
The following is a loose guideline. Other combinations of Go and operating
systems for building and running tools from this repo may work, but have not
been tested.

### Building source code

- Go
- see this project's `go.mod` file for *preferred* version
- this project tests against [officially supported Go
releases][go-supported-releases]
- the most recent stable release (aka, "stable")
- the prior, but still supported release (aka, "oldstable")
- GCC
- if building with custom options (as the provided `Makefile` does)
- `make`
- if using the provided `Makefile`

Tested using:
### Running

- Go 1.13+
- Windows 10 Version 1903
- native
- WSL
- Ubuntu Linux 16.04+
- Windows 10
- Ubuntu Linux 18.04+

## How to install it
## Installation

### From source

Expand Down
2 changes: 1 addition & 1 deletion dependabot/docker/go/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# binaries) to reflect that version of Go.

# https://hub.docker.com/_/golang
FROM golang:1.16.12
FROM golang:1.17.5
16 changes: 15 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,23 @@

module github.com/atc0005/go-lockss

go 1.14
go 1.17

require (
github.com/antchfx/xmlquery v1.3.9
github.com/apex/log v1.9.0
)

require (
github.com/antchfx/xpath v1.2.0 // indirect
github.com/fatih/color v1.7.0 // indirect
github.com/go-logfmt/logfmt v0.4.0 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 // indirect
github.com/mattn/go-colorable v0.1.2 // indirect
github.com/mattn/go-isatty v0.0.8 // indirect
github.com/pkg/errors v0.8.1 // indirect
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc // indirect
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd // indirect
golang.org/x/text v0.3.2 // indirect
)
3 changes: 0 additions & 3 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,8 @@ github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht
github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
Expand Down Expand Up @@ -81,7 +79,6 @@ golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
Expand Down
9 changes: 0 additions & 9 deletions vendor/github.com/antchfx/xmlquery/go.mod

This file was deleted.

16 changes: 0 additions & 16 deletions vendor/github.com/antchfx/xmlquery/go.sum

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/antchfx/xpath/go.mod

This file was deleted.

32 changes: 0 additions & 32 deletions vendor/github.com/apex/log/go.mod

This file was deleted.

117 changes: 0 additions & 117 deletions vendor/github.com/apex/log/go.sum

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/go-logfmt/logfmt/go.mod

This file was deleted.

2 changes: 0 additions & 2 deletions vendor/github.com/go-logfmt/logfmt/go.sum

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/mattn/go-colorable/go.mod

This file was deleted.

4 changes: 0 additions & 4 deletions vendor/github.com/mattn/go-colorable/go.sum

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/mattn/go-isatty/go.mod

This file was deleted.

2 changes: 0 additions & 2 deletions vendor/github.com/mattn/go-isatty/go.sum

This file was deleted.

Loading

0 comments on commit 462ca53

Please sign in to comment.