diff --git a/.drone.star b/.drone.star index 9908c5a02..3f86efd1f 100644 --- a/.drone.star +++ b/.drone.star @@ -302,7 +302,7 @@ def cachePipeline(name, steps): "steps": steps, "trigger": { "ref": [ - "refs/heads/stable-*", + "refs/heads/master", "refs/tags/**", "refs/pull/**", ], @@ -362,6 +362,7 @@ def getGoBinForTesting(ctx): cacheGoBin(), "trigger": { "ref": [ + "refs/heads/master", "refs/heads/stable-*", "refs/pull/**", ], @@ -500,7 +501,7 @@ def testOcis(ctx): "steps": steps, "trigger": { "ref": [ - "refs/heads/stable-*", + "refs/heads/master", "refs/pull/**", ], }, @@ -556,7 +557,7 @@ def buildOcisBinaryForTesting(ctx): rebuildBuildArtifactCache(ctx, "ocis-binary-amd64", "ocis/bin"), "trigger": { "ref": [ - "refs/heads/stable-*", + "refs/heads/master", "refs/pull/**", ], }, @@ -643,7 +644,7 @@ def uploadScanResults(ctx): ], "trigger": { "ref": [ - "refs/heads/stable-*", + "refs/heads/master", "refs/pull/**", ], "status": [ @@ -757,7 +758,7 @@ def codestyle(ctx): "depends_on": [], "trigger": { "ref": [ - "refs/heads/stable-*", + "refs/heads/master", "refs/pull/**", "refs/tags/**", ], @@ -811,7 +812,7 @@ def localApiTestPipeline(ctx): "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), "trigger": { "ref": [ - "refs/heads/stable-*", + "refs/heads/master", "refs/pull/**", ], }, @@ -871,7 +872,7 @@ def cs3ApiTests(ctx, storage, accounts_hash_difficulty = 4): "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), "trigger": { "ref": [ - "refs/heads/stable-*", + "refs/heads/master", "refs/pull/**", ], }, @@ -978,7 +979,7 @@ def wopiValidatorTests(ctx, storage, accounts_hash_difficulty = 4): "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), "trigger": { "ref": [ - "refs/heads/stable-*", + "refs/heads/master", "refs/pull/**", ], }, @@ -1027,7 +1028,7 @@ def coreApiTests(ctx, part_number = 1, number_of_parts = 1, storage = "ocis", ac "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), "trigger": { "ref": [ - "refs/heads/stable-*", + "refs/heads/master", "refs/pull/**", ], }, @@ -1151,7 +1152,7 @@ def uiTestPipeline(ctx, filterTags, runPart = 1, numberOfParts = 1, storage = "o "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)] + buildWebCache(ctx)), "trigger": { "ref": [ - "refs/heads/stable-*", + "refs/heads/master", "refs/pull/**", ], }, @@ -1175,7 +1176,7 @@ def e2eTests(ctx): e2e_trigger = { "ref": [ - "refs/heads/stable-*", + "refs/heads/master", "refs/tags/**", "refs/pull/**", ], @@ -1384,7 +1385,7 @@ def dockerRelease(ctx, arch): "depends_on": depends_on, "trigger": { "ref": [ - "refs/heads/stable-*", + "refs/heads/master", "refs/tags/v*", "refs/pull/**", ], @@ -1461,6 +1462,7 @@ def binaryRelease(ctx, name): ], "when": { "ref": [ + "refs/heads/master", "refs/tags/v*", ], }, @@ -1471,6 +1473,7 @@ def binaryRelease(ctx, name): "settings": settings, "when": { "ref": [ + "refs/heads/master", "refs/tags/v*", ], }, @@ -1513,7 +1516,7 @@ def binaryRelease(ctx, name): "depends_on": depends_on, "trigger": { "ref": [ - "refs/heads/stable-*", + "refs/heads/master", "refs/tags/v*", "refs/pull/**", ], @@ -1605,6 +1608,7 @@ def licenseCheck(ctx): "settings": settings, "when": { "ref": [ + "refs/heads/master", "refs/tags/v*", ], }, @@ -1614,7 +1618,7 @@ def licenseCheck(ctx): "image": OC_CI_GOLANG, "environment": DRONE_HTTP_PROXY_ENV, "commands": [ - "make changelog CHANGELOG_VERSION=%s" % ctx.build.ref.replace("refs/tags/v", ""), + "make changelog CHANGELOG_VERSION=%s" % ctx.build.ref.replace("refs/tags/v", "").split("-")[0], ], "when": { "ref": [ @@ -1646,6 +1650,7 @@ def licenseCheck(ctx): ], "trigger": { "ref": [ + "refs/heads/master", "refs/tags/v*", "refs/pull/**", ], @@ -1681,6 +1686,7 @@ def releaseDockerManifest(): ], "trigger": { "ref": [ + "refs/heads/master", "refs/tags/v*", ], }, @@ -1727,7 +1733,7 @@ def changelog(): "push", ], "message": "Automated changelog update [skip ci]", - "branch": "stable-5.0", + "branch": "master", "author_email": "devops@owncloud.com", "author_name": "ownClouders", "netrc_machine": "github.com", @@ -1749,7 +1755,7 @@ def changelog(): ], "trigger": { "ref": [ - "refs/heads/stable-*", + "refs/heads/master", "refs/pull/**", ], }, @@ -1783,6 +1789,7 @@ def releaseDockerReadme(ctx): ], "trigger": { "ref": [ + "refs/heads/master", "refs/tags/v*", ], }, @@ -1832,7 +1839,7 @@ def docs(): }, "pages_directory": "docs/hugo/content/", "copy_contents": "true", - "target_branch": "docs-stable-5.0", + "target_branch": "docs", "delete": "true", }, "when": { @@ -1854,7 +1861,7 @@ def docs(): ], "trigger": { "ref": [ - "refs/heads/stable-*", + "refs/heads/master", "refs/pull/**", ], }, @@ -1920,7 +1927,7 @@ def notify(): "depends_on": [], "trigger": { "ref": [ - "refs/heads/stable-*", + "refs/heads/master", "refs/heads/release*", "refs/tags/**", ], @@ -2225,6 +2232,7 @@ def deploy(ctx, config, rebuild): ], "trigger": { "ref": [ + "refs/heads/master", "refs/tags/v*", ], }, @@ -2329,7 +2337,7 @@ def genericCachePurge(flush_path): ], "trigger": { "ref": [ - "refs/heads/stable-*", + "refs/heads/master", "refs/pull/**", ], "status": [ @@ -2581,7 +2589,7 @@ def litmus(ctx, storage): "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), "trigger": { "ref": [ - "refs/heads/stable-*", + "refs/heads/master", "refs/pull/**", ], }, @@ -2887,8 +2895,5 @@ def k6LoadTests(ctx): "event": [ "cron", ], - "ref": [ - "refs/heads/master", - ], }, }] diff --git a/deployments/continuous-deployment-config/ocis_keycloak/released.yml b/deployments/continuous-deployment-config/ocis_keycloak/released.yml index 8a2d8e3b9..7b4745672 100644 --- a/deployments/continuous-deployment-config/ocis_keycloak/released.yml +++ b/deployments/continuous-deployment-config/ocis_keycloak/released.yml @@ -32,7 +32,7 @@ env: INSECURE: "false" TRAEFIK_ACME_MAIL: wkloucek@owncloud.com - OCIS_DOCKER_TAG: 5.0.0-rc.3 + OCIS_DOCKER_TAG: 4.0.0 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 diff --git a/deployments/continuous-deployment-config/ocis_ldap/released.yml b/deployments/continuous-deployment-config/ocis_ldap/released.yml index d942ee04f..abba2b35f 100644 --- a/deployments/continuous-deployment-config/ocis_ldap/released.yml +++ b/deployments/continuous-deployment-config/ocis_ldap/released.yml @@ -32,7 +32,7 @@ env: INSECURE: "false" TRAEFIK_ACME_MAIL: wkloucek@owncloud.com - OCIS_DOCKER_TAG: 5.0.0-rc.3 + OCIS_DOCKER_TAG: 4.0.0 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 diff --git a/deployments/continuous-deployment-config/ocis_traefik/released.yml b/deployments/continuous-deployment-config/ocis_traefik/released.yml index c34ef74c9..befd8657b 100644 --- a/deployments/continuous-deployment-config/ocis_traefik/released.yml +++ b/deployments/continuous-deployment-config/ocis_traefik/released.yml @@ -32,7 +32,7 @@ env: INSECURE: "false" TRAEFIK_ACME_MAIL: wkloucek@owncloud.com - OCIS_DOCKER_TAG: 5.0.0-rc.3 + OCIS_DOCKER_TAG: 4.0.0 OCIS_DOMAIN: ocis.ocis-traefik.released.owncloud.works DEMO_USERS: "true" INBUCKET_DOMAIN: mail.ocis-traefik.released.owncloud.works diff --git a/deployments/continuous-deployment-config/ocis_wopi/released.yml b/deployments/continuous-deployment-config/ocis_wopi/released.yml index 4afc72352..c8521d340 100644 --- a/deployments/continuous-deployment-config/ocis_wopi/released.yml +++ b/deployments/continuous-deployment-config/ocis_wopi/released.yml @@ -32,7 +32,7 @@ env: INSECURE: "false" TRAEFIK_ACME_MAIL: wkloucek@owncloud.com - OCIS_DOCKER_TAG: 5.0.0-rc.3 + OCIS_DOCKER_TAG: 4.0.0 OCIS_DOMAIN: ocis.ocis-wopi.released.owncloud.works COMPANION_DOMAIN: companion.ocis-wopi.released.owncloud.works COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud diff --git a/ocis-pkg/version/version.go b/ocis-pkg/version/version.go index fe27cc1f6..86a21cac1 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 = "5.0.0-rc.4+dev" + LatestTag = "5.1.0-prealpha+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 e9383ea45..c4ada13e4 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=5.0.0-rc.4 +sonar.projectVersion=5.1.0-prealpha sonar.host.url=https://sonarcloud.io # =====================================================