Skip to content

Commit

Permalink
prepare release, bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
micbar committed Nov 25, 2022
1 parent 6107fe8 commit 6584989
Show file tree
Hide file tree
Showing 202 changed files with 442 additions and 7,333 deletions.
7,739 changes: 434 additions & 7,305 deletions CHANGELOG.md

Large diffs are not rendered by default.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ Changelog for reva 2.12.0 (2022-11-25)
* Enhancement [cs3org/reva#3397](https://github.com/cs3org/reva/pull/3397): Reduce lock contention issues

https://github.com/owncloud/ocis/pull/5092
https://github.com/owncloud/ocis/pull/5131
File renamed without changes.
File renamed without changes.
23 changes: 1 addition & 22 deletions changelog/CHANGELOG.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{{ $version := .Version -}}
{{/* ocis beta program */ -}}
{{ if eq .Version "2.0.0" -}}
{{ $version = (printf "%v-%v" $version "rc.1") -}}
{{ $version = (printf "%v-%v" $version "rc.2") -}}
{{ end -}}
{{ if gt (len $allVersions) 1 -}}
# Changelog for [{{ $version }}] ({{ .Date }})
Expand Down Expand Up @@ -38,25 +38,4 @@ The following sections list the changes for {{ $version }}.
* {{ .Type }} - {{ .Title }}: [#{{ .PrimaryID }}]({{ .PrimaryURL }})
{{- end }}{{ end }}

## Details
{{ range $entry := .Entries }}{{ with $entry }}
* {{ .Type }} - {{ .Title }}: [#{{ .PrimaryID }}]({{ .PrimaryURL }})
{{ range $par := .Paragraphs -}}
{{/* Workaround for keeping lists inside of changelog items well formatted */ -}}
{{ if hasPrefix "*" $par }}
{{ $par | replace " *" "\n *" }}
{{- else }}
{{ wrapIndent $par 80 3 -}}
{{ end }}
{{ end -}}
{{ range $url := .IssueURLs }}
{{ $url -}}
{{ end -}}
{{ range $url := .PRURLs }}
{{ $url -}}
{{ end -}}
{{ range $url := .OtherURLs }}
{{ $url -}}
{{ end }}
{{ end }}{{ end -}}
{{ end }}{{ end -}}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
env:
INSECURE: "false"
TRAEFIK_ACME_MAIL: wkloucek@owncloud.com
OCIS_DOCKER_TAG: 2.0.0-rc.1
OCIS_DOCKER_TAG: 2.0.0-rc.2
OCIS_DOMAIN: ocis.ocis-keycloak.released.owncloud.works
KEYCLOAK_DOMAIN: keycloak.ocis-keycloak.released.owncloud.works
COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
env:
INSECURE: "false"
TRAEFIK_ACME_MAIL: wkloucek@owncloud.com
OCIS_DOCKER_TAG: 2.0.0-rc.1
OCIS_DOCKER_TAG: 2.0.0-rc.2
OCIS_DOMAIN: ocis.ocis-ldap.released.owncloud.works
LDAP_MANAGER_DOMAIN: ldap.ocis-ldap.released.owncloud.works
COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
env:
INSECURE: "false"
TRAEFIK_ACME_MAIL: wkloucek@owncloud.com
OCIS_DOCKER_TAG: 2.0.0-rc.1
OCIS_DOCKER_TAG: 2.0.0-rc.2
OCIS_DOMAIN: ocis.ocis-traefik.released.owncloud.works
DEMO_USERS: "true"
INBUCKET_DOMAIN: mail.ocis-traefik.released.owncloud.works
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
env:
INSECURE: "false"
TRAEFIK_ACME_MAIL: wkloucek@owncloud.com
OCIS_DOCKER_TAG: 2.0.0-rc.1
OCIS_DOCKER_TAG: 2.0.0-rc.2
OCIS_DOMAIN: ocis.ocis-wopi.released.owncloud.works
WOPISERVER_DOMAIN: wopiserver.ocis-wopi.released.owncloud.works
COLLABORA_DOMAIN: collabora.ocis-wopi.released.owncloud.works
Expand Down
2 changes: 1 addition & 1 deletion ocis-pkg/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var (
// LatestTag is the latest released version plus the dev meta version.
// Will be overwritten by the release pipeline
// Needs a manual change for every tagged release
LatestTag = "2.0.0-rc.1+dev"
LatestTag = "2.0.0-rc.2+dev"

// Date indicates the build date.
Date = time.Now().Format("20060102")
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
sonar.projectKey=owncloud_ocis
sonar.organization=owncloud-1
sonar.projectName=ocis
sonar.projectVersion=2.0.0-rc.1
sonar.projectVersion=2.0.0-rc.2
sonar.host.url=https://sonarcloud.io

# =====================================================
Expand Down

0 comments on commit 6584989

Please sign in to comment.