From c961423e9eb34fd7eb23f974d8327b0fa52d4595 Mon Sep 17 00:00:00 2001 From: Jamie Holdstock Date: Fri, 12 Aug 2022 16:30:23 +0100 Subject: [PATCH] Update to go 1.19 (#351) --- .github/workflows/go.yml | 10 +++++----- .gitignore | 2 +- README.md | 2 +- config.go | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index eb9d06d..c938086 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -6,20 +6,20 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: [1.17, 1.18] + go: [1.18, 1.19] steps: - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a #v3.2.1 with: go-version: ${{ matrix.go }} - name: Check out source - uses: actions/checkout@v2 + uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b #v3.0.2 - name: Build run: go build ./... - name: Test run: env GORACE="halt_on_error=1" go test -race ./... - name: Lint - uses: golangci/golangci-lint-action@v2 + uses: golangci/golangci-lint-action@537aa1903e5d359d0b27dbc19ddd22c5087f3fbc #v3.2.0 with: - version: v1.45.2 + version: v1.48.0 diff --git a/.gitignore b/.gitignore index ac27e5f..bb53e8a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,6 @@ cov.out /database/test.db /database/test.db-backup -# Go 1.18 workspace +# Go workspace go.work go.work.sum diff --git a/README.md b/README.md index 862d068..cee0dc0 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ VSP will add the ticket to a pool of always-online voting wallets. ## Implementation -vspd is built and tested on go 1.17 and 1.18, making use of the following +vspd is built and tested on go 1.18 and 1.19, making use of the following libraries: - [gin-gonic/gin](https://github.com/gin-gonic/gin) webserver. diff --git a/config.go b/config.go index 6decdf5..09f0117 100644 --- a/config.go +++ b/config.go @@ -161,10 +161,10 @@ func normalizeAddress(addr, defaultPort string) string { // line options. // // The configuration proceeds as follows: -// 1) Start with a default config with sane settings -// 2) Pre-parse the command line to check for an alternative config file -// 3) Load configuration file overwriting defaults with any specified options -// 4) Parse CLI options and overwrite/add any specified options +// 1. Start with a default config with sane settings +// 2. Pre-parse the command line to check for an alternative config file +// 3. Load configuration file overwriting defaults with any specified options +// 4. Parse CLI options and overwrite/add any specified options // // The above results in vspd functioning properly without any config settings // while still allowing the user to override settings with config files and