From e586a71570aa79f5cd55909b231d0115d3d5bcee Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Mon, 8 Jul 2024 15:49:26 +0200 Subject: [PATCH] chore: prepare changelog, bump version, update CD --- changelog/{unreleased => 6.1.0_2024-07-08}/activity-api.md | 0 changelog/{unreleased => 6.1.0_2024-07-08}/activitylog-fixes.md | 0 .../{unreleased => 6.1.0_2024-07-08}/add-backchannal-event.md | 0 .../allow-disable-versioning.md | 0 .../{unreleased => 6.1.0_2024-07-08}/autoprovsion-groups.md | 0 changelog/{unreleased => 6.1.0_2024-07-08}/bump-reva.md | 0 .../{unreleased => 6.1.0_2024-07-08}/consistency-fail-flag.md | 0 .../deprecate-gateway-envvars.md | 0 changelog/{unreleased => 6.1.0_2024-07-08}/empty-trash-dirs.md | 0 .../fix-dockerfile-for-posixfs.md | 0 .../{unreleased => 6.1.0_2024-07-08}/fix-email-notification.md | 0 .../{unreleased => 6.1.0_2024-07-08}/fix-email-template.md | 0 changelog/{unreleased => 6.1.0_2024-07-08}/fix-pw-reset.md | 0 changelog/{unreleased => 6.1.0_2024-07-08}/fix-secure-view.md | 0 .../fix-sharingng-permission-listings.md | 0 .../harden-postprocessing-restart.md | 0 changelog/{unreleased => 6.1.0_2024-07-08}/index-all-spaces.md | 0 .../initial-ocm-support-for-graph.md | 0 .../ocm-configurable-timeouts.md | 0 .../{unreleased => 6.1.0_2024-07-08}/remove-revisions-cli.md | 0 changelog/{unreleased => 6.1.0_2024-07-08}/update-web-9.1.0.md | 0 .../ocis_full/onlyoffice-rolling.yml | 2 +- deployments/continuous-deployment-config/ocis_full/rolling.yml | 2 +- .../continuous-deployment-config/ocis_full/s3-rolling.yml | 2 +- .../continuous-deployment-config/ocis_keycloak/rolling.yml | 2 +- deployments/continuous-deployment-config/ocis_ldap/rolling.yml | 2 +- ocis-pkg/version/version.go | 2 +- sonar-project.properties | 2 +- 28 files changed, 7 insertions(+), 7 deletions(-) rename changelog/{unreleased => 6.1.0_2024-07-08}/activity-api.md (100%) rename changelog/{unreleased => 6.1.0_2024-07-08}/activitylog-fixes.md (100%) rename changelog/{unreleased => 6.1.0_2024-07-08}/add-backchannal-event.md (100%) rename changelog/{unreleased => 6.1.0_2024-07-08}/allow-disable-versioning.md (100%) rename changelog/{unreleased => 6.1.0_2024-07-08}/autoprovsion-groups.md (100%) rename changelog/{unreleased => 6.1.0_2024-07-08}/bump-reva.md (100%) rename changelog/{unreleased => 6.1.0_2024-07-08}/consistency-fail-flag.md (100%) rename changelog/{unreleased => 6.1.0_2024-07-08}/deprecate-gateway-envvars.md (100%) rename changelog/{unreleased => 6.1.0_2024-07-08}/empty-trash-dirs.md (100%) rename changelog/{unreleased => 6.1.0_2024-07-08}/fix-dockerfile-for-posixfs.md (100%) rename changelog/{unreleased => 6.1.0_2024-07-08}/fix-email-notification.md (100%) rename changelog/{unreleased => 6.1.0_2024-07-08}/fix-email-template.md (100%) rename changelog/{unreleased => 6.1.0_2024-07-08}/fix-pw-reset.md (100%) rename changelog/{unreleased => 6.1.0_2024-07-08}/fix-secure-view.md (100%) rename changelog/{unreleased => 6.1.0_2024-07-08}/fix-sharingng-permission-listings.md (100%) rename changelog/{unreleased => 6.1.0_2024-07-08}/harden-postprocessing-restart.md (100%) rename changelog/{unreleased => 6.1.0_2024-07-08}/index-all-spaces.md (100%) rename changelog/{unreleased => 6.1.0_2024-07-08}/initial-ocm-support-for-graph.md (100%) rename changelog/{unreleased => 6.1.0_2024-07-08}/ocm-configurable-timeouts.md (100%) rename changelog/{unreleased => 6.1.0_2024-07-08}/remove-revisions-cli.md (100%) rename changelog/{unreleased => 6.1.0_2024-07-08}/update-web-9.1.0.md (100%) diff --git a/changelog/unreleased/activity-api.md b/changelog/6.1.0_2024-07-08/activity-api.md similarity index 100% rename from changelog/unreleased/activity-api.md rename to changelog/6.1.0_2024-07-08/activity-api.md diff --git a/changelog/unreleased/activitylog-fixes.md b/changelog/6.1.0_2024-07-08/activitylog-fixes.md similarity index 100% rename from changelog/unreleased/activitylog-fixes.md rename to changelog/6.1.0_2024-07-08/activitylog-fixes.md diff --git a/changelog/unreleased/add-backchannal-event.md b/changelog/6.1.0_2024-07-08/add-backchannal-event.md similarity index 100% rename from changelog/unreleased/add-backchannal-event.md rename to changelog/6.1.0_2024-07-08/add-backchannal-event.md diff --git a/changelog/unreleased/allow-disable-versioning.md b/changelog/6.1.0_2024-07-08/allow-disable-versioning.md similarity index 100% rename from changelog/unreleased/allow-disable-versioning.md rename to changelog/6.1.0_2024-07-08/allow-disable-versioning.md diff --git a/changelog/unreleased/autoprovsion-groups.md b/changelog/6.1.0_2024-07-08/autoprovsion-groups.md similarity index 100% rename from changelog/unreleased/autoprovsion-groups.md rename to changelog/6.1.0_2024-07-08/autoprovsion-groups.md diff --git a/changelog/unreleased/bump-reva.md b/changelog/6.1.0_2024-07-08/bump-reva.md similarity index 100% rename from changelog/unreleased/bump-reva.md rename to changelog/6.1.0_2024-07-08/bump-reva.md diff --git a/changelog/unreleased/consistency-fail-flag.md b/changelog/6.1.0_2024-07-08/consistency-fail-flag.md similarity index 100% rename from changelog/unreleased/consistency-fail-flag.md rename to changelog/6.1.0_2024-07-08/consistency-fail-flag.md diff --git a/changelog/unreleased/deprecate-gateway-envvars.md b/changelog/6.1.0_2024-07-08/deprecate-gateway-envvars.md similarity index 100% rename from changelog/unreleased/deprecate-gateway-envvars.md rename to changelog/6.1.0_2024-07-08/deprecate-gateway-envvars.md diff --git a/changelog/unreleased/empty-trash-dirs.md b/changelog/6.1.0_2024-07-08/empty-trash-dirs.md similarity index 100% rename from changelog/unreleased/empty-trash-dirs.md rename to changelog/6.1.0_2024-07-08/empty-trash-dirs.md diff --git a/changelog/unreleased/fix-dockerfile-for-posixfs.md b/changelog/6.1.0_2024-07-08/fix-dockerfile-for-posixfs.md similarity index 100% rename from changelog/unreleased/fix-dockerfile-for-posixfs.md rename to changelog/6.1.0_2024-07-08/fix-dockerfile-for-posixfs.md diff --git a/changelog/unreleased/fix-email-notification.md b/changelog/6.1.0_2024-07-08/fix-email-notification.md similarity index 100% rename from changelog/unreleased/fix-email-notification.md rename to changelog/6.1.0_2024-07-08/fix-email-notification.md diff --git a/changelog/unreleased/fix-email-template.md b/changelog/6.1.0_2024-07-08/fix-email-template.md similarity index 100% rename from changelog/unreleased/fix-email-template.md rename to changelog/6.1.0_2024-07-08/fix-email-template.md diff --git a/changelog/unreleased/fix-pw-reset.md b/changelog/6.1.0_2024-07-08/fix-pw-reset.md similarity index 100% rename from changelog/unreleased/fix-pw-reset.md rename to changelog/6.1.0_2024-07-08/fix-pw-reset.md diff --git a/changelog/unreleased/fix-secure-view.md b/changelog/6.1.0_2024-07-08/fix-secure-view.md similarity index 100% rename from changelog/unreleased/fix-secure-view.md rename to changelog/6.1.0_2024-07-08/fix-secure-view.md diff --git a/changelog/unreleased/fix-sharingng-permission-listings.md b/changelog/6.1.0_2024-07-08/fix-sharingng-permission-listings.md similarity index 100% rename from changelog/unreleased/fix-sharingng-permission-listings.md rename to changelog/6.1.0_2024-07-08/fix-sharingng-permission-listings.md diff --git a/changelog/unreleased/harden-postprocessing-restart.md b/changelog/6.1.0_2024-07-08/harden-postprocessing-restart.md similarity index 100% rename from changelog/unreleased/harden-postprocessing-restart.md rename to changelog/6.1.0_2024-07-08/harden-postprocessing-restart.md diff --git a/changelog/unreleased/index-all-spaces.md b/changelog/6.1.0_2024-07-08/index-all-spaces.md similarity index 100% rename from changelog/unreleased/index-all-spaces.md rename to changelog/6.1.0_2024-07-08/index-all-spaces.md diff --git a/changelog/unreleased/initial-ocm-support-for-graph.md b/changelog/6.1.0_2024-07-08/initial-ocm-support-for-graph.md similarity index 100% rename from changelog/unreleased/initial-ocm-support-for-graph.md rename to changelog/6.1.0_2024-07-08/initial-ocm-support-for-graph.md diff --git a/changelog/unreleased/ocm-configurable-timeouts.md b/changelog/6.1.0_2024-07-08/ocm-configurable-timeouts.md similarity index 100% rename from changelog/unreleased/ocm-configurable-timeouts.md rename to changelog/6.1.0_2024-07-08/ocm-configurable-timeouts.md diff --git a/changelog/unreleased/remove-revisions-cli.md b/changelog/6.1.0_2024-07-08/remove-revisions-cli.md similarity index 100% rename from changelog/unreleased/remove-revisions-cli.md rename to changelog/6.1.0_2024-07-08/remove-revisions-cli.md diff --git a/changelog/unreleased/update-web-9.1.0.md b/changelog/6.1.0_2024-07-08/update-web-9.1.0.md similarity index 100% rename from changelog/unreleased/update-web-9.1.0.md rename to changelog/6.1.0_2024-07-08/update-web-9.1.0.md diff --git a/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml b/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml index 467b4064a2a..2393e0643bd 100644 --- a/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml +++ b/deployments/continuous-deployment-config/ocis_full/onlyoffice-rolling.yml @@ -32,7 +32,7 @@ env: INSECURE: "false" TRAEFIK_ACME_MAIL: mbarz@owncloud.com - OCIS_DOCKER_TAG: 6.1.0-alpha.1 + OCIS_DOCKER_TAG: 6.1.0 OCIS_DOCKER_IMAGE: owncloud/ocis-rolling OCIS_DOMAIN: ocis.ocis-onlyoffice.rolling.owncloud.works COMPANION_DOMAIN: companion.ocis-onlyoffice.rolling.owncloud.works diff --git a/deployments/continuous-deployment-config/ocis_full/rolling.yml b/deployments/continuous-deployment-config/ocis_full/rolling.yml index a33af3c4799..e946d841b65 100644 --- a/deployments/continuous-deployment-config/ocis_full/rolling.yml +++ b/deployments/continuous-deployment-config/ocis_full/rolling.yml @@ -32,7 +32,7 @@ env: INSECURE: "false" TRAEFIK_ACME_MAIL: mbarz@owncloud.com - OCIS_DOCKER_TAG: 6.1.0-alpha.1 + OCIS_DOCKER_TAG: 6.1.0 OCIS_DOCKER_IMAGE: owncloud/ocis-rolling OCIS_DOMAIN: ocis.ocis.rolling.owncloud.works COMPANION_DOMAIN: companion.ocis.rolling.owncloud.works diff --git a/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml b/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml index c5bd2cca50b..4bf01f21802 100644 --- a/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml +++ b/deployments/continuous-deployment-config/ocis_full/s3-rolling.yml @@ -32,7 +32,7 @@ env: INSECURE: "false" TRAEFIK_ACME_MAIL: mbarz@owncloud.com - OCIS_DOCKER_TAG: 6.1.0-alpha.1 + OCIS_DOCKER_TAG: 6.1.0 OCIS_DOCKER_IMAGE: owncloud/ocis-rolling OCIS_DOMAIN: ocis.ocis-s3.rolling.owncloud.works COMPANION_DOMAIN: companion.ocis-s3.rolling.owncloud.works diff --git a/deployments/continuous-deployment-config/ocis_keycloak/rolling.yml b/deployments/continuous-deployment-config/ocis_keycloak/rolling.yml index f039ab45548..66b28e5dbc5 100644 --- a/deployments/continuous-deployment-config/ocis_keycloak/rolling.yml +++ b/deployments/continuous-deployment-config/ocis_keycloak/rolling.yml @@ -32,7 +32,7 @@ env: INSECURE: "false" TRAEFIK_ACME_MAIL: mbarz@owncloud.com - OCIS_DOCKER_TAG: 6.1.0-alpha.1 + OCIS_DOCKER_TAG: 6.1.0 OCIS_DOCKER_IMAGE: owncloud/ocis-rolling OCIS_DOMAIN: ocis.ocis-keycloak.rolling.owncloud.works KEYCLOAK_DOMAIN: keycloak.ocis-keycloak.rolling.owncloud.works diff --git a/deployments/continuous-deployment-config/ocis_ldap/rolling.yml b/deployments/continuous-deployment-config/ocis_ldap/rolling.yml index 46a7cdcf19a..bc79cad2cbc 100644 --- a/deployments/continuous-deployment-config/ocis_ldap/rolling.yml +++ b/deployments/continuous-deployment-config/ocis_ldap/rolling.yml @@ -32,7 +32,7 @@ env: INSECURE: "false" TRAEFIK_ACME_MAIL: mbarz@owncloud.com - OCIS_DOCKER_TAG: 6.1.0-alpha.1 + OCIS_DOCKER_TAG: 6.1.0 OCIS_DOCKER_IMAGE: owncloud/ocis-rolling OCIS_DOMAIN: ocis.ocis-ldap.rolling.owncloud.works LDAP_MANAGER_DOMAIN: ldap.ocis-ldap.rolling.owncloud.works diff --git a/ocis-pkg/version/version.go b/ocis-pkg/version/version.go index 6638abfd6c4..8f362fddc37 100644 --- a/ocis-pkg/version/version.go +++ b/ocis-pkg/version/version.go @@ -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 = "6.0.0+dev" + LatestTag = "6.1.0+dev" // Date indicates the build date. // This has been removed, it looks like you can only replace static strings with recent go versions diff --git a/sonar-project.properties b/sonar-project.properties index fede9ee8f51..9e5346db2aa 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=owncloud_ocis sonar.organization=owncloud-1 sonar.projectName=ocis -sonar.projectVersion=6.0.0 +sonar.projectVersion=6.1.0 sonar.host.url=https://sonarcloud.io # =====================================================