From 860e1ad9eafa808dc00fde589166b03491181a4c Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Tue, 17 Dec 2024 10:48:20 +0100 Subject: [PATCH] chore: bump version, change production CD --- .../ocis_full/production.yml | 9 ++++----- ocis-pkg/version/version.go | 2 +- sonar-project.properties | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/deployments/continuous-deployment-config/ocis_full/production.yml b/deployments/continuous-deployment-config/ocis_full/production.yml index 32523e1fa4d..508efd432e1 100644 --- a/deployments/continuous-deployment-config/ocis_full/production.yml +++ b/deployments/continuous-deployment-config/ocis_full/production.yml @@ -26,21 +26,20 @@ docker_compose_projects: - name: ocis git_url: https://github.com/owncloud/ocis.git - ref: stable-5.0 - docker_compose_path: deployments/examples/ocis_wopi + ref: master + docker_compose_path: deployments/examples/ocis_full env: INSECURE: "false" TRAEFIK_ACME_MAIL: mbarz@owncloud.com - OCIS_DOCKER_TAG: 5.0.9 + OCIS_DOCKER_TAG: 7.0.0 OCIS_DOMAIN: ocis.ocis.production.owncloud.works COMPANION_DOMAIN: companion.ocis.production.owncloud.works COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud WOPISERVER_DOMAIN: wopiserver.ocis.production.owncloud.works COLLABORA_DOMAIN: collabora.ocis.production.owncloud.works - ONLYOFFICE_DOMAIN: onlyoffice.ocis.production.owncloud.works INBUCKET_DOMAIN: mail.ocis.production.owncloud.works DEMO_USERS: "true" - COMPOSE_FILE: docker-compose.yml:ocis.yml:tika.yml:collabora.yml:wopiserver.yml:companion.yml:inbucket.yml:monitoring.yml + COMPOSE_FILE: docker-compose.yml:ocis.yml:tika.yml:collabora.yml:web_extensions/extensions.yml:web_extensions/unzip.yml:web_extensions/importer.yml:inbucket.yml:monitoring_tracing/monitoring.yml - name: monitoring git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git ref: master diff --git a/ocis-pkg/version/version.go b/ocis-pkg/version/version.go index 416ac373657..29b01b6fb5f 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 = "7.0.0-rc.5+dev" + LatestTag = "7.0.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 beb5e41103f..304aaf04360 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=7.0.0-rc.5 +sonar.projectVersion=7.0.0 sonar.host.url=https://sonarcloud.io # =====================================================