Skip to content

Commit

Permalink
Merge pull request #99 from cybozu-go/update-dependencies
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
yokaze committed Nov 29, 2023
2 parents 8f892c2 + 9dd2b6a commit 7afceca
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 148 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,18 @@ on:
push:
branches:
- 'main'
env:
go-version: "1.20"
jobs:
build:
name: Build
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup golang
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: ${{ env.go-version }}
go-version-file: go.mod

- name: Install test tools
run: make setup
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,18 @@ on:
push:
tags:
- 'v*'
env:
go-version: "1.20"
jobs:
build:
name: Release
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup golang
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: ${{ env.go-version }}
go-version-file: go.mod

- name: Build binaries
run: make install GOBIN=`pwd`/docker
Expand Down
29 changes: 14 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,30 @@ go 1.20
require (
github.com/cybozu-go/log v1.7.0
github.com/cybozu-go/well v1.11.2
github.com/google/go-cmp v0.5.9
github.com/prometheus/client_golang v1.14.0
github.com/prometheus/client_model v0.3.0
github.com/spf13/cobra v1.6.1
golang.org/x/term v0.13.0
github.com/google/go-cmp v0.6.0
github.com/prometheus/client_golang v1.17.0
github.com/prometheus/client_model v0.5.0
github.com/spf13/cobra v1.8.0
golang.org/x/term v0.15.0
gopkg.in/ini.v1 v1.67.0
sigs.k8s.io/yaml v1.3.0
sigs.k8s.io/yaml v1.4.0
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cybozu-go/netutil v1.4.4 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/onsi/gomega v1.25.0 // indirect
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/spf13/afero v1.9.3 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
Expand All @@ -38,9 +38,8 @@ require (
github.com/vishvananda/netlink v1.2.1-beta.2 // indirect
github.com/vishvananda/netns v0.0.3 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 7afceca

Please sign in to comment.