Skip to content

Commit

Permalink
Merge pull request #86 from cybozu-go/update-2024-07
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
morimoto-cybozu authored Sep 6, 2024
2 parents f77497d + bab466c commit 2ce9beb
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 74 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/setup-go@v5
with:
go-version-file: go.mod
- run: docker run -d --network host gcr.io/etcd-development/etcd:v3.5.10
- run: docker run -d --network host gcr.io/etcd-development/etcd:v3.5.15
- run: make SUDO="sudo" setup
- run: make test-tools
- run: make check-generate
Expand Down Expand Up @@ -47,11 +47,11 @@ jobs:
with:
go-version-file: go.mod
- id: auth
uses: google-github-actions/auth@v1
uses: google-github-actions/auth@v2
with:
credentials_json: ${{ secrets.NECO_TEST_SERVICE_ACCOUNT }}
- name: Set up Cloud SDK for etcdpasswd
uses: google-github-actions/setup-gcloud@v1
uses: google-github-actions/setup-gcloud@v2
- name: Set GCP instance name
run: echo "INSTANCE_NAME=etcdpasswd-${{ github.run_number }}-$(TZ=Asia/Tokyo date +%H%M%S)" >> $GITHUB_ENV
- run: |
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
runs-on: ubuntu-22.04
if: startsWith(github.ref, 'refs/tags/v')
container:
image: ghcr.io/cybozu/golang:1.21-jammy # used for ghr, not for go command
image: ghcr.io/cybozu/golang:1.22-jammy # used for ghr, not for go command
steps:
- run: mkdir -p /tmp/upload
- name: Download etcdpasswd deb package
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

### Changed

- Update dependencies in [#86](https://github.com/cybozu-go/etcdpasswd/pull/86)

## [1.4.7] - 2024-03-21

### Fixed
Expand Down
46 changes: 22 additions & 24 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
module github.com/cybozu-go/etcdpasswd

go 1.22

toolchain go1.22.1
go 1.22.6

require (
github.com/cybozu-go/etcdutil v1.6.7
github.com/cybozu-go/etcdutil v1.6.8
github.com/cybozu-go/log v1.7.0
github.com/cybozu-go/well v1.11.2
github.com/onsi/ginkgo/v2 v2.17.0
github.com/onsi/gomega v1.32.0
github.com/spf13/cobra v1.8.0
go.etcd.io/etcd/client/v3 v3.5.12
golang.org/x/crypto v0.21.0
github.com/onsi/ginkgo/v2 v2.20.2
github.com/onsi/gomega v1.34.2
github.com/spf13/cobra v1.8.1
go.etcd.io/etcd/client/v3 v3.5.15
golang.org/x/crypto v0.26.0
sigs.k8s.io/yaml v1.4.0
)

Expand All @@ -21,17 +19,17 @@ require (
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/cybozu-go/netutil v1.4.7 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/pprof v0.0.0-20240320155624-b11c3daa6f07 // indirect
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
Expand All @@ -42,19 +40,19 @@ require (
github.com/subosito/gotenv v1.6.0 // indirect
github.com/vishvananda/netlink v1.2.1-beta.2 // indirect
github.com/vishvananda/netns v0.0.4 // indirect
go.etcd.io/etcd/api/v3 v3.5.12 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect
go.etcd.io/etcd/api/v3 v3.5.15 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.15 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.19.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
google.golang.org/grpc v1.62.1 // indirect
google.golang.org/protobuf v1.33.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/tools v0.24.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
google.golang.org/grpc v1.65.0 // indirect
google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 2ce9beb

Please sign in to comment.