mirror of
https://github.com/zulip/zulip.git
synced 2025-10-24 08:33:43 +00:00
Compare commits
2 Commits
8.4
...
6.0-beta1-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d30fcac192 | ||
|
|
cc60e8a0a0 |
@@ -5,7 +5,7 @@ This page the release history for the Zulip server. See also the
|
|||||||
|
|
||||||
## Zulip 6.x series
|
## Zulip 6.x series
|
||||||
|
|
||||||
### 6.0 -- unreleased
|
### 6.0-beta1 -- 2022-10-12
|
||||||
|
|
||||||
This section is an incomplete draft of the release notes for the next
|
This section is an incomplete draft of the release notes for the next
|
||||||
major release, and is only updated occasionally. See the [commit
|
major release, and is only updated occasionally. See the [commit
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ cd "$(dirname "$0")/.."
|
|||||||
remote="$(git config zulip.zulipRemote)" || remote=upstream
|
remote="$(git config zulip.zulipRemote)" || remote=upstream
|
||||||
{
|
{
|
||||||
git describe --always --tags --match='[0-9]*'
|
git describe --always --tags --match='[0-9]*'
|
||||||
branches="$(git for-each-ref --format='%(objectname)' "refs/remotes/$remote/main" "refs/remotes/$remote/*.x")"
|
branches="$(git for-each-ref --format='%(objectname)' "refs/remotes/$remote/main" "refs/remotes/$remote/*.x" "refs/remotes/$remote/*-branch")"
|
||||||
mapfile -t branches <<<"$branches"
|
mapfile -t branches <<<"$branches"
|
||||||
if merge_base="$(git merge-base -- HEAD "${branches[@]}")"; then
|
if merge_base="$(git merge-base -- HEAD "${branches[@]}")"; then
|
||||||
git describe --always --tags --match='[0-9]*' -- "$merge_base"
|
git describe --always --tags --match='[0-9]*' -- "$merge_base"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import os
|
import os
|
||||||
|
|
||||||
ZULIP_VERSION = "6.0-dev+git"
|
ZULIP_VERSION = "6.0-beta1"
|
||||||
|
|
||||||
# Add information on number of commits and commit hash to version, if available
|
# Add information on number of commits and commit hash to version, if available
|
||||||
zulip_git_version_file = os.path.join(
|
zulip_git_version_file = os.path.join(
|
||||||
|
|||||||
Reference in New Issue
Block a user