Skip to content
This repository has been archived by the owner on Mar 31, 2023. It is now read-only.

Commit

Permalink
Merge pull request #40 from cybozu-go/update-dependencies
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
morimoto-cybozu authored Aug 30, 2022
2 parents 040fa44 + 4f22dae commit 9ec4b5b
Show file tree
Hide file tree
Showing 8 changed files with 485 additions and 192 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ on:
branches:
- 'main'
env:
go-version: 1.17
go-version: 1.18
cache-version: 1
jobs:
test:
name: Small tests
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: ${{ env.go-version }}
- run: test -z "$(gofmt -s -l . | tee /dev/stderr)"
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: release
on:
push:
tags:
- 'v*'
jobs:
release:
name: Release on GitHub
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- name: Create release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
version=$(echo ${{ github.ref }} | sed -e "s#refs/tags/##g")
if echo $version | grep -q -e '-'; then prerelease=-p; fi
gh release create $version $prerelease \
-t "Release $version" \
-n "See [CHANGELOG.md](./CHANGELOG.md) for details."
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

### Changed
- Update dependencies (#40).

## [1.11.0] - 2021-12-15

### Changed
Expand Down
80 changes: 80 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
Release procedure
=================

This document describes how to release a new version of well.

Versioning
----------

Follow [semantic versioning 2.0.0][semver] to choose the new version number.

Prepare change log entries
--------------------------

Add notable changes since the last release to [CHANGELOG.md](CHANGELOG.md).
It should look like:

```markdown
(snip)
## [Unreleased]

### Added
- Implement ... (#35)

### Changed
- Fix a bug in ... (#33)

### Removed
- Deprecated `-option` is removed ... (#39)

(snip)
```

Bump version
------------

1. Determine a new version number. Then set `VERSION` variable.

```console
# Set VERSION and confirm it. It should not have "v" prefix.
$ VERSION=x.y.z
$ echo $VERSION
```

2. Make a branch to release

```console
$ git neco dev "bump-$VERSION"
```

3. Edit `CHANGELOG.md` for the new version ([example][]).
4. Commit the change and push it.

```console
$ git commit -a -m "Bump version to $VERSION"
$ git neco review
```

5. Merge this branch.
6. Add a git tag to the main HEAD, then push it.

```console
# Set VERSION again.
$ VERSION=x.y.z
$ echo $VERSION

$ git checkout main
$ git pull
$ git tag -a -m "Release v$VERSION" "v$VERSION"

# Make sure the release tag exists.
$ git tag -ln | grep $VERSION

$ git push origin "v$VERSION"
```

GitHub actions will build and push artifacts such as container images and
create a new GitHub release.

[semver]: https://semver.org/spec/v2.0.0.html
[example]: https://github.com/cybozu-go/etcdpasswd/commit/77d95384ac6c97e7f48281eaf23cb94f68867f79
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
module github.com/cybozu-go/well

require (
github.com/BurntSushi/toml v0.4.1
github.com/BurntSushi/toml v1.2.0
github.com/cybozu-go/log v1.6.1
github.com/cybozu-go/netutil v1.4.2
github.com/cybozu-go/netutil v1.4.3
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.10.0
golang.org/x/net v0.0.0-20211209124913-491a49abca63
github.com/spf13/viper v1.12.0
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b
)

go 1.13
235 changes: 169 additions & 66 deletions go.sum

Large diffs are not rendered by default.

36 changes: 19 additions & 17 deletions test/spf13/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,32 @@ replace github.com/cybozu-go/well => ../..

require (
github.com/cybozu-go/log v1.6.1
github.com/cybozu-go/well v1.10.0
github.com/spf13/cobra v1.2.1
github.com/spf13/viper v1.10.0
github.com/cybozu-go/well v1.11.0
github.com/spf13/cobra v1.5.0
github.com/spf13/viper v1.12.0
)

require (
github.com/cybozu-go/netutil v1.4.2 // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/cybozu-go/netutil v1.4.3 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/onsi/gomega v1.14.0 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/onsi/gomega v1.20.1 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
github.com/spf13/afero v1.9.2 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/subosito/gotenv v1.4.1 // indirect
github.com/vishvananda/netlink v1.1.0 // indirect
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b // indirect
golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64 // indirect
golang.org/x/text v0.3.7 // indirect
gopkg.in/ini.v1 v1.66.2 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 9ec4b5b

Please sign in to comment.