From 83045747382c5bf6887ce374940be6970afc5cd3 Mon Sep 17 00:00:00 2001 From: Joe Chen Date: Wed, 8 Jun 2022 01:32:37 +0800 Subject: [PATCH] release: minor updates to templates and docs (#7027) [skip ci] --- .github/ISSUE_TEMPLATE/dev_release_minor_version.md | 1 - .github/ISSUE_TEMPLATE/dev_release_patch_version.md | 1 - docs/dev/release/release_new_version.md | 9 ++++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/dev_release_minor_version.md b/.github/ISSUE_TEMPLATE/dev_release_minor_version.md index d6aed0f27..cd22194f0 100644 --- a/.github/ISSUE_TEMPLATE/dev_release_minor_version.md +++ b/.github/ISSUE_TEMPLATE/dev_release_minor_version.md @@ -25,7 +25,6 @@ On the release branch: - [ ] Publish new RC releases (e.g. `v0.12.0-rc.1`, `v0.12.0-rc.2`) to ensure Docker workflow succeeds. **Make sure the tag is created on the release branch**. - [ ] Pull down the Docker image and [run through application setup](https://github.com/gogs/gogs/blob/main/docker/README.md) to make sure nothing blows up. - [ ] Publish a new [GitHub release](https://github.com/gogs/gogs/releases) with entries from [CHANGELOG](https://github.com/gogs/gogs/blob/main/CHANGELOG.md) for the current minor release. **Make sure the tag is created on the release branch**. - - [ ] Only mention patch authors for the current release. - [ ] [Wait for a new image tag for the current release](https://github.com/gogs/gogs/actions/workflows/docker.yml?query=event%3Arelease) to be created automatically on both [Docker Hub](https://hub.docker.com/r/gogs/gogs/tags) and [GitHub Container registry](https://github.com/gogs/gogs/pkgs/container/gogs). - [ ] [Push a new Docker image tag](https://github.com/gogs/gogs/blob/main/docs/dev/release/release_new_version.md#update-docker-image-tag) as `.` to both [Docker Hub](https://hub.docker.com/r/gogs/gogs/tags) and [GitHub Container registry](https://github.com/gogs/gogs/pkgs/container/gogs), e.g.: - [ ] [Compile and pack binaries](https://github.com/gogs/gogs/blob/main/docs/dev/release/release_new_version.md#compile-and-pack-binaries) (all prefixed with `gogs_.._`, e.g. `gogs_0.12.0_`): diff --git a/.github/ISSUE_TEMPLATE/dev_release_patch_version.md b/.github/ISSUE_TEMPLATE/dev_release_patch_version.md index 01bab1c0e..6ae7bb05a 100644 --- a/.github/ISSUE_TEMPLATE/dev_release_patch_version.md +++ b/.github/ISSUE_TEMPLATE/dev_release_patch_version.md @@ -23,7 +23,6 @@ On the release branch: - [ ] Publish new RC releases (e.g. `v0.12.0-rc.1`, `v0.12.0-rc.2`) to ensure Docker workflow succeeds. **Make sure the tag is created on the release branch**. - [ ] Pull down the Docker image and [run through application setup](https://github.com/gogs/gogs/blob/main/docker/README.md) to make sure nothing blows up. - [ ] Publish a new [GitHub release](https://github.com/gogs/gogs/releases) with entries from [CHANGELOG](https://github.com/gogs/gogs/blob/main/CHANGELOG.md) for the current patch release and all previous releases with same minor version. **Make sure the tag is created on the release branch**. - - [ ] Only mention patch authors for the current release. - [ ] Update all previous GitHub releases with same minor version with the warning: ``` **ℹ️ Heads up! There is a new patch release [0.12.1](https://github.com/gogs/gogs/releases/tag/v0.12.1) available, we recommend directly installing or upgrading to that version.** diff --git a/docs/dev/release/release_new_version.md b/docs/dev/release/release_new_version.md index 90b214040..cb7c3468f 100644 --- a/docs/dev/release/release_new_version.md +++ b/docs/dev/release/release_new_version.md @@ -30,10 +30,13 @@ gogs/gogs:${MINOR_RELEASE}-armv7 $ docker manifest push gogs/gogs:${MINOR_RELEASE} - # Only push "linux/amd64" for now $ echo ${GITHUB_CR_PAT} | docker login ghcr.io -u --password-stdin - $ docker pull --platform linux/amd64 gogs/gogs:${VERSION} - $ docker tag gogs/gogs:${VERSION} ghcr.io/gogs/gogs:${MINOR_RELEASE} + $ docker manifest create \ + ghcr.io/gogs/gogs:${MINOR_RELEASE} \ + gogs/gogs:${MINOR_RELEASE}-amd64 \ + gogs/gogs:${MINOR_RELEASE}-arm64 \ + gogs/gogs:${MINOR_RELEASE}-armv7 + $ docker manifest push ghcr.io/gogs/gogs:${MINOR_RELEASE} $ docker push ghcr.io/gogs/gogs:${MINOR_RELEASE} ``` 2. Delete ephemeral tags from the [Docker Hub](https://hub.docker.com/repository/docker/gogs/gogs/tags).