diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index b0d0d1f0d..d89f921b8 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -32,8 +32,9 @@ body:
label: Installation method
description: Please select your installation method
options:
+ - dist.ipfs.tech or ipfs-update
+ - docker image
- ipfs-desktop
- - ipfs-update or dist.ipfs.tech
- third-party binary
- built from source
- type: textarea
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index ce927e5e5..f83809240 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -32,7 +32,7 @@ jobs:
if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch'
name: Push Docker image to Docker Hub
runs-on: ubuntu-latest
- timeout-minutes: 90
+ timeout-minutes: 15
env:
IMAGE_NAME: ipfs/kubo
LEGACY_IMAGE_NAME: ipfs/go-ipfs
@@ -110,9 +110,17 @@ jobs:
# We test all the images on amd64 host here. This uses QEMU to emulate
# the other platforms.
- - run: docker run --rm $IMAGE_NAME:linux-amd64 --version
- - run: docker run --rm $IMAGE_NAME:linux-arm-v7 --version
- - run: docker run --rm $IMAGE_NAME:linux-arm64-v8 --version
+ # NOTE: --version should finish instantly, but sometimes
+ # it hangs on github CI (could be qemu issue), so we retry to remove false negatives
+ - name: Smoke-test linux-amd64
+ run: for i in {1..3}; do timeout 15s docker run --rm $IMAGE_NAME:linux-amd64 version --all && break || [ $i = 3 ] && exit 1; done
+ timeout-minutes: 1
+ - name: Smoke-test linux-arm-v7
+ run: for i in {1..3}; do timeout 15s docker run --rm $IMAGE_NAME:linux-arm-v7 version --all && break || [ $i = 3 ] && exit 1; done
+ timeout-minutes: 1
+ - name: Smoke-test linux-arm64-v8
+ run: for i in {1..3}; do timeout 15s docker run --rm $IMAGE_NAME:linux-arm64-v8 version --all && break || [ $i = 3 ] && exit 1; done
+ timeout-minutes: 1
# This will only push the previously built images.
- if: github.event_name != 'workflow_dispatch' || github.event.inputs.push == 'true'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 621e07d7f..f26207f83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
# Kubo Changelogs
+- [v0.33](docs/changelogs/v0.33.md)
- [v0.32](docs/changelogs/v0.32.md)
- [v0.31](docs/changelogs/v0.31.md)
- [v0.30](docs/changelogs/v0.30.md)
diff --git a/docs/RELEASE_CHECKLIST.md b/docs/RELEASE_CHECKLIST.md
index 9a9d7f113..5d086376e 100644
--- a/docs/RELEASE_CHECKLIST.md
+++ b/docs/RELEASE_CHECKLIST.md
@@ -1,4 +1,4 @@
-
+
# ✅ Release Checklist (vX.Y.Z[-rcN])
@@ -56,7 +56,7 @@ This section covers tasks to be done during each release.
- use `release` as base if `Z > 0`
- [ ]  update the `CurrentVersionNumber` in [version.go](version.go) in the `master` branch to `vX.Y+1.0-dev`
- [example](https://github.com/ipfs/kubo/pull/9305)
- - [ ] update the `CurrentVersionNumber` in [version.go](version.go) in the `release-vX.Y` branch to `vX.Y.Z(-RCN)`
+ - [ ] update the `CurrentVersionNumber` in [version.go](version.go) in the `release-vX.Y` branch to `vX.Y.Z(-rcN)`
- [example](https://github.com/ipfs/kubo/pull/9394)
- [ ] create a draft PR from `release-vX.Y` to `release`
- [example](https://github.com/ipfs/kubo/pull/9306)
@@ -71,10 +71,10 @@ This section covers tasks to be done during each release.
- [ ] Create the release tag using `./kuboreleaser release --version vX.Y.Z(-rcN) tag` or ...
- This is a dangerous operation! Go and Docker publishing are difficult to reverse! Have the release reviewer verify all the commands marked with ⚠️!
- - [ ] ⚠️  tag the HEAD commit using `git tag -s vX.Y.Z(-RCN) -m 'Prerelease X.Y.Z(-RCN)'`
+ - [ ] ⚠️  tag the HEAD commit using `git tag -s vX.Y.Z(-rcN) -m 'Prerelease X.Y.Z(-rcN)'`
- [ ] ⚠️  tag the HEAD commit of the `release` branch using `git tag -s vX.Y.Z -m 'Release X.Y.Z'`
- - [ ] ⚠️ verify the tag is signed and tied to the correct commit using `git show vX.Y.Z(-RCN)`
- - [ ] ⚠️ push the tag to GitHub using `git push origin vX.Y.Z(-RCN)`
+ - [ ] ⚠️ verify the tag is signed and tied to the correct commit using `git show vX.Y.Z(-rcN)`
+ - [ ] ⚠️ push the tag to GitHub using `git push origin vX.Y.Z(-rcN)`
- do **NOT** use `git push --tags` because it pushes all your local tags
- [ ] Verify [ipfs/distributions](https://github.com/ipfs/distributions)'s `.tool-versions`'s `golang` entry is set to the [latest go release](https://go.dev/doc/devel/release) on the major go branch [Kubo is being tested on](https://github.com/ipfs/kubo/blob/master/.github/workflows/gotest.yml) (see `go-version:`).
@@ -85,7 +85,7 @@ This section covers tasks to be done during each release.
- [ ] Publish the release to [dist.ipfs.tech](https://dist.ipfs.tech) using `./kuboreleaser release --version vX.Y.Z(-rcN) publish-to-distributions` or ...
- [ ] check out [ipfs/distributions](https://github.com/ipfs/distributions)
- [ ] create new branch: run `git checkout -b release-kubo-X.Y.Z(-rcN)`
- - [ ] run `./dist.sh add-version kubo vX.Y.Z(-RCN)` to add the new version to the `versions` file
+ - [ ] run `./dist.sh add-version kubo vX.Y.Z(-rcN)` to add the new version to the `versions` file
- [usage](https://github.com/ipfs/distributions#usage)
- [ ] create and merge the PR which updates `dists/kubo/versions` and `dists/go-ipfs/versions` ( and `dists/kubo/current` and `dists/go-ipfs/current`)
- [example](https://github.com/ipfs/distributions/pull/760)
@@ -101,7 +101,7 @@ This section covers tasks to be done during each release.
- [ ] create a new release on [GitHub](https://docs.github.com/en/repositories/releasing-projects-on-github/managing-releases-in-a-repository#creating-a-release)
- [RC example](https://github.com/ipfs/kubo/releases/tag/v0.17.0-rc1)
- [FINAL example](https://github.com/ipfs/kubo/releases/tag/v0.17.0)
- - [ ] use the `vX.Y.Z(-RCN)` tag
+ - [ ] use the `vX.Y.Z(-rcN)` tag
- [ ] link to the release issue
- [ ]  link to the changelog in the description
- [ ]  check the `This is a pre-release` checkbox
@@ -109,7 +109,7 @@ This section covers tasks to be done during each release.
- [ ]  do **NOT** check the `This is a pre-release` checkbox
- [ ] run the [sync-release-assets](https://github.com/ipfs/kubo/actions/workflows/sync-release-assets.yml) workflow
- [ ] wait for the [sync-release-assets](https://github.com/ipfs/kubo/actions/workflows/sync-release-assets.yml) workflow run to finish
- - [ ] verify the release assets are present in the [GitHub release](https://github.com/ipfs/kubo/releases/tag/vX.Y.Z(-RCN))
+ - [ ] verify the release assets are present in the [GitHub release](https://github.com/ipfs/kubo/releases/tag/vX.Y.Z(-rcN))
- [ ] Update Kubo staging environment, see the [Running Kubo tests on staging](https://www.notion.so/Running-Kubo-tests-on-staging-488578bb46154f9bad982e4205621af8) for details.
- [ ]  Test last release against the current RC
@@ -118,7 +118,7 @@ This section covers tasks to be done during each release.
- [ ] create an [IPFS Discourse](https://discuss.ipfs.tech) topic
- [prerelease example](https://discuss.ipfs.tech/t/kubo-v0-16-0-rc1-release-candidate-is-out/15248)
- [release example](https://discuss.ipfs.tech/t/kubo-v0-16-0-release-is-out/15249)
- - [ ] use `Kubo vX.Y.Z(-RCN) is out!` as the title
+ - [ ] use `Kubo vX.Y.Z(-rcN) is out!` as the title
- [ ] use `kubo` and `go-ipfs` as topics
- [ ] repeat the title as a heading (`##`) in the description
- [ ] link to the GitHub Release, binaries on IPNS, docker pull command and release notes in the description
@@ -128,7 +128,7 @@ This section covers tasks to be done during each release.
- [ ] [#ipfs-chatter](https://discord.com/channels/669268347736686612/669268347736686615) in IPFS Discord
- [ ] [#ipfs-chatter](https://filecoinproject.slack.com/archives/C018EJ8LWH1) in FIL Slack
- [ ] [#ipfs-chatter:ipfs.io](https://matrix.to/#/#ipfs-chatter:ipfs.io) in Matrix
- - [ ]  Add the link to the [IPFS Discourse](https://discuss.ipfs.tech) topic to the [GitHub Release](https://github.com/ipfs/kubo/releases/tag/vX.Y.Z(-RCN)) description
+ - [ ]  Add the link to the [IPFS Discourse](https://discuss.ipfs.tech) topic to the [GitHub Release](https://github.com/ipfs/kubo/releases/tag/vX.Y.Z(-rcN)) description
- [example](https://github.com/ipfs/kubo/releases/tag/v0.17.0)
- [ ]  create an issue comment mentioning early testers on the release issue
- [example](https://github.com/ipfs/kubo/issues/9319#issuecomment-1311002478)
@@ -136,12 +136,12 @@ This section covers tasks to be done during each release.
- [example](https://github.com/ipfs/kubo/issues/9417#issuecomment-1400740975)
- [ ]   ask the marketing team to tweet about the release in [#shared-pl-marketing-requests](https://filecoinproject.slack.com/archives/C018EJ8LWH1) in FIL Slack
- [example](https://filecoinproject.slack.com/archives/C018EJ8LWH1/p1664885305374900)
- - [ ]   post the link to the [GitHub Release](https://github.com/ipfs/kubo/releases/tag/vX.Y.Z(-RCN)) to [Reddit](https://reddit.com/r/ipfs)
+ - [ ]   post the link to the [GitHub Release](https://github.com/ipfs/kubo/releases/tag/vX.Y.Z(-rcN)) to [Reddit](https://reddit.com/r/ipfs)
- [example](https://www.reddit.com/r/ipfs/comments/9x0q0k/kubo_v0160_release_is_out/)
- [ ] ~~Test the new version with `ipfs-companion`~~ ([currently skipped](https://github.com/ipfs/ipfs-companion/issues/1300)) using `./kuboreleaser release --version vX.Y.Z(-rcN) test-ipfs-companion` or ...
- [ ] run the [e2e](https://github.com/ipfs/ipfs-companion/actions/workflows/e2e.yml)
- - use `vX.Y.Z(-RCN)` as the Kubo image version
+ - use `vX.Y.Z(-rcN)` as the Kubo image version
- [ ] wait for the [e2e](https://github.com/ipfs/ipfs-companion/actions/workflows/e2e.yml) workflow run to finish
- [ ]  Update Kubo in [ipfs-desktop](https://github.com/ipfs/ipfs-desktop) using `./kuboreleaser release --version vX.Y.Z(-rcN) update-ipfs-desktop` or ...
diff --git a/docs/changelogs/v0.33.md b/docs/changelogs/v0.33.md
new file mode 100644
index 000000000..711092a2c
--- /dev/null
+++ b/docs/changelogs/v0.33.md
@@ -0,0 +1,21 @@
+# Kubo changelog v0.33
+
+- [v0.33.0](#v0310)
+
+## v0.33.0
+
+- [Overview](#overview)
+- [🔦 Highlights](#-highlights)
+ - [📦️ Dependency updates](#-dependency-updates)
+- [📝 Changelog](#-changelog)
+- [👨👩👧👦 Contributors](#-contributors)
+
+### Overview
+
+### 🔦 Highlights
+
+#### 📦️ Dependency updates
+
+### 📝 Changelog
+
+### 👨👩👧👦 Contributors
diff --git a/version.go b/version.go
index 4b0b756c0..fb1f2383a 100644
--- a/version.go
+++ b/version.go
@@ -11,7 +11,7 @@ import (
var CurrentCommit string
// CurrentVersionNumber is the current application's version literal.
-const CurrentVersionNumber = "0.32.1"
+const CurrentVersionNumber = "0.33.0-dev"
const ApiVersion = "/kubo/" + CurrentVersionNumber + "/" //nolint