Skip to content

Commit

Permalink
Update for go 1.18 (#286)
Browse files Browse the repository at this point in the history
  • Loading branch information
jholdstock committed Mar 30, 2022
1 parent 5d55dd2 commit 39589dc
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
go: [1.16, 1.17]
go: [1.17, 1.18]
steps:
- name: Set up Go
uses: actions/setup-go@v2
Expand All @@ -15,7 +15,7 @@ jobs:
- name: Check out source
uses: actions/checkout@v2
- name: Install Linters
run: "curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.44.2"
run: "curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.45.2"
- name: Build
run: go build ./...
- name: Test
Expand Down
13 changes: 11 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
*.exe
dcrvotingweb
*~
vendor/
hardforkdemo
dcrvotingweb
*.orig
.vscode

# Testing, profiling, and benchmarking artifacts
cov.out
*cpu.out
*mem.out

# Go 1.18 workspace
go.work
go.work.sum
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build image
FROM golang:1.17
FROM golang:1.18

LABEL description="dcrvotingweb build"
LABEL version="1.0"
Expand All @@ -13,7 +13,7 @@ COPY ./ /root/
RUN go build -v .

# Serve image
FROM golang:1.17
FROM golang:1.18

LABEL description="dcrvotingweb serve"
LABEL version="1.0"
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ISC License

Copyright (c) 2015-2021, The Decred developers
Copyright (c) 2015-2022, The Decred developers
Copyright (c) 2017, Jonathan Chappelow

Permission to use, copy, modify, and/or distribute this software for any
Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
dcrvotingweb
============
# dcrvotingweb

[![Build Status](https://github.com/decred/dcrvotingweb/workflows/Build%20and%20Test/badge.svg)](https://github.com/decred/dcrvotingweb/actions)
[![ISC License](https://img.shields.io/badge/license-ISC-blue.svg)](http://copyfree.org)

## Overview

dcrvotingweb is a simple web app that connects to dcrd and displays
information about consensus rule voting.

## Installation

## Developing

It is recommended to use Go 1.17 (or newer) for development.
Expand Down
25 changes: 24 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/decred/dcrvotingweb

go 1.16
go 1.17

require (
github.com/decred/dcrd/chaincfg/v3 v3.1.1
Expand All @@ -11,3 +11,26 @@ require (
github.com/dustin/go-humanize v1.0.0
github.com/jessevdk/go-flags v1.5.0
)

require (
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
github.com/dchest/siphash v1.2.2 // indirect
github.com/decred/base58 v1.0.3 // indirect
github.com/decred/dcrd/blockchain/stake/v4 v4.0.0 // indirect
github.com/decred/dcrd/chaincfg/chainhash v1.0.3 // indirect
github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect
github.com/decred/dcrd/crypto/ripemd160 v1.0.1 // indirect
github.com/decred/dcrd/database/v3 v3.0.0 // indirect
github.com/decred/dcrd/dcrec v1.0.0 // indirect
github.com/decred/dcrd/dcrec/edwards/v2 v2.0.2 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v3 v3.0.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
github.com/decred/dcrd/dcrjson/v4 v4.0.0 // indirect
github.com/decred/dcrd/dcrutil/v4 v4.0.0 // indirect
github.com/decred/dcrd/gcs/v3 v3.0.0 // indirect
github.com/decred/dcrd/txscript/v4 v4.0.0 // indirect
github.com/decred/go-socks v1.1.0 // indirect
github.com/decred/slog v1.2.0 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4 // indirect
)
3 changes: 1 addition & 2 deletions reloadsig.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
// Copyright (c) 2017-2021 The Decred developers
// Copyright (c) 2017-2022 The Decred developers
// Use of this source code is governed by an ISC
// license that can be found in the LICENSE file.

//go:build darwin || dragonfly || freebsd || linux || nacl || netbsd || openbsd || solaris
// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris

package main

Expand Down
3 changes: 1 addition & 2 deletions reloadsig_windows.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
// Copyright (c) 2017-2021 The Decred developers
// Copyright (c) 2017-2022 The Decred developers
// Use of this source code is governed by an ISC
// license that can be found in the LICENSE file.

//go:build windows
// +build windows

package main

Expand Down

0 comments on commit 39589dc

Please sign in to comment.