Skip to content

Commit

Permalink
feat:upgrade golang 1.15 (#11)
Browse files Browse the repository at this point in the history
  • Loading branch information
h-r-k-matsumoto authored Dec 15, 2020
1 parent 6580984 commit b584238
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 23 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version: "3"
services:
# Update this to the name of the service you want to work with in your docker-compose.yml file
go:
image: golang:1.14
image: golang:1.15
# If you want add a non-root user to your Dockerfile, you can use the "remoteUser"
# property in devcontainer.json to cause VS Code its sub-processes (terminals, tasks,
# debugging) to execute as the user. Uncomment the next line if you want the entire
Expand Down Expand Up @@ -49,6 +49,6 @@ services:
environment:
- PASSENGER_INSTANCE_REGISTRY_DIR=/sock
volumes:
- unix-sock:/sock # mysqldソケットファイルディレクトリを共有
- unix-sock:/sock
volumes:
unix-sock:
5 changes: 3 additions & 2 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: '1.14'
go-version: '1.15'
- uses: actions/cache@v2
with:
path: ~/go/pkg/mod
Expand All @@ -36,4 +36,5 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: golangci/golangci-lint-action@v2
- uses: golangci/golangci-lint-action@v2

2 changes: 1 addition & 1 deletion .github/workflows/releease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.14
go-version: 1.15

- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v2
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.14 AS builder
FROM golang:1.15 AS builder
WORKDIR /go/src/github.com/rakutentech/passenger-go-exporter

COPY go.mod go.sum ./
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Implemented in golang, keeps memory consumption below 100MB, and runs on CPU 0.0

## Supported version

- golang: 1.14
- golang: 1.15
- Passenger: 6.0.4, or later.

All other versions have not been tested.
Expand Down
12 changes: 7 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
module github.com/rakutentech/passenger-go-exporter

go 1.14
go 1.15

require (
github.com/go-kit/kit v0.10.0
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.7.1
github.com/prometheus/common v0.10.0
github.com/prometheus/client_golang v1.8.0
github.com/prometheus/common v0.15.0
github.com/stretchr/testify v1.6.1
golang.org/x/net v0.0.0-20200707034311-ab3426394381
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect
golang.org/x/net v0.0.0-20201209123823-ac852fbbde11
golang.org/x/sys v0.0.0-20201211090839-8ad439b19e0f // indirect
golang.org/x/text v0.3.4 // indirect
google.golang.org/protobuf v1.25.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
)
45 changes: 34 additions & 11 deletions go.sum

Large diffs are not rendered by default.

0 comments on commit b584238

Please sign in to comment.