sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"browser": "./src/caf.js",

Browse Source 
fix: keep .drone.star and released cd instances as in master
This commit is contained in:
Benedikt Kulmann
2024-02-14 15:06:10 +01:00
parent e0342492a1
commit 331e92e25c
7 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.star
+29 -24
View File
@@ -302,7 +302,7 @@ def cachePipeline(name, steps):
"steps": steps, "steps": steps,
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/master",
"refs/tags/**", "refs/tags/**",
"refs/pull/**", "refs/pull/**",
], ],
@@ -362,6 +362,7 @@ def getGoBinForTesting(ctx):
cacheGoBin(), cacheGoBin(),
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/master",
"refs/heads/stable-*", "refs/heads/stable-*",
"refs/pull/**", "refs/pull/**",
], ],
@@ -500,7 +501,7 @@ def testOcis(ctx):
"steps": steps, "steps": steps,
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/master",
"refs/pull/**", "refs/pull/**",
], ],
}, },
@@ -556,7 +557,7 @@ def buildOcisBinaryForTesting(ctx):
rebuildBuildArtifactCache(ctx, "ocis-binary-amd64", "ocis/bin"), rebuildBuildArtifactCache(ctx, "ocis-binary-amd64", "ocis/bin"),
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/master",
"refs/pull/**", "refs/pull/**",
], ],
}, },
@@ -643,7 +644,7 @@ def uploadScanResults(ctx):
], ],
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/master",
"refs/pull/**", "refs/pull/**",
], ],
"status": [ "status": [
@@ -757,7 +758,7 @@ def codestyle(ctx):
"depends_on": [], "depends_on": [],
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/master",
"refs/pull/**", "refs/pull/**",
"refs/tags/**", "refs/tags/**",
], ],
@@ -811,7 +812,7 @@ def localApiTestPipeline(ctx):
"depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]),
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/master",
"refs/pull/**", "refs/pull/**",
], ],
}, },
@@ -871,7 +872,7 @@ def cs3ApiTests(ctx, storage, accounts_hash_difficulty = 4):
"depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]),
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/master",
"refs/pull/**", "refs/pull/**",
], ],
}, },
@@ -978,7 +979,7 @@ def wopiValidatorTests(ctx, storage, accounts_hash_difficulty = 4):
"depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]),
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/master",
"refs/pull/**", "refs/pull/**",
], ],
}, },
@@ -1027,7 +1028,7 @@ def coreApiTests(ctx, part_number = 1, number_of_parts = 1, storage = "ocis", ac
"depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]),
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/master",
"refs/pull/**", "refs/pull/**",
], ],
}, },
@@ -1151,7 +1152,7 @@ def uiTestPipeline(ctx, filterTags, runPart = 1, numberOfParts = 1, storage = "o
"depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)] + buildWebCache(ctx)), "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)] + buildWebCache(ctx)),
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/master",
"refs/pull/**", "refs/pull/**",
], ],
}, },
@@ -1175,7 +1176,7 @@ def e2eTests(ctx):
e2e_trigger = { e2e_trigger = {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/master",
"refs/tags/**", "refs/tags/**",
"refs/pull/**", "refs/pull/**",
], ],
@@ -1384,7 +1385,7 @@ def dockerRelease(ctx, arch):
"depends_on": depends_on, "depends_on": depends_on,
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/master",
"refs/tags/v*", "refs/tags/v*",
"refs/pull/**", "refs/pull/**",
], ],
@@ -1461,6 +1462,7 @@ def binaryRelease(ctx, name):
], ],
"when": { "when": {
"ref": [ "ref": [
"refs/heads/master",
"refs/tags/v*", "refs/tags/v*",
], ],
}, },
@@ -1471,6 +1473,7 @@ def binaryRelease(ctx, name):
"settings": settings, "settings": settings,
"when": { "when": {
"ref": [ "ref": [
"refs/heads/master",
"refs/tags/v*", "refs/tags/v*",
], ],
}, },
@@ -1513,7 +1516,7 @@ def binaryRelease(ctx, name):
"depends_on": depends_on, "depends_on": depends_on,
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/master",
"refs/tags/v*", "refs/tags/v*",
"refs/pull/**", "refs/pull/**",
], ],
@@ -1605,6 +1608,7 @@ def licenseCheck(ctx):
"settings": settings, "settings": settings,
"when": { "when": {
"ref": [ "ref": [
"refs/heads/master",
"refs/tags/v*", "refs/tags/v*",
], ],
}, },
@@ -1614,7 +1618,7 @@ def licenseCheck(ctx):
"image": OC_CI_GOLANG, "image": OC_CI_GOLANG,
"environment": DRONE_HTTP_PROXY_ENV, "environment": DRONE_HTTP_PROXY_ENV,
"commands": [ "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": { "when": {
"ref": [ "ref": [
@@ -1646,6 +1650,7 @@ def licenseCheck(ctx):
], ],
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/master",
"refs/tags/v*", "refs/tags/v*",
"refs/pull/**", "refs/pull/**",
], ],
@@ -1681,6 +1686,7 @@ def releaseDockerManifest():
], ],
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/master",
"refs/tags/v*", "refs/tags/v*",
], ],
}, },
@@ -1727,7 +1733,7 @@ def changelog():
"push", "push",
], ],
"message": "Automated changelog update [skip ci]", "message": "Automated changelog update [skip ci]",
"branch": "stable-5.0", "branch": "master",
"author_email": "devops@owncloud.com", "author_email": "devops@owncloud.com",
"author_name": "ownClouders", "author_name": "ownClouders",
"netrc_machine": "github.com", "netrc_machine": "github.com",
@@ -1749,7 +1755,7 @@ def changelog():
], ],
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/master",
"refs/pull/**", "refs/pull/**",
], ],
}, },
@@ -1783,6 +1789,7 @@ def releaseDockerReadme(ctx):
], ],
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/master",
"refs/tags/v*", "refs/tags/v*",
], ],
}, },
@@ -1832,7 +1839,7 @@ def docs():
}, },
"pages_directory": "docs/hugo/content/", "pages_directory": "docs/hugo/content/",
"copy_contents": "true", "copy_contents": "true",
"target_branch": "docs-stable-5.0", "target_branch": "docs",
"delete": "true", "delete": "true",
}, },
"when": { "when": {
@@ -1854,7 +1861,7 @@ def docs():
], ],
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/master",
"refs/pull/**", "refs/pull/**",
], ],
}, },
@@ -1920,7 +1927,7 @@ def notify():
"depends_on": [], "depends_on": [],
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/master",
"refs/heads/release*", "refs/heads/release*",
"refs/tags/**", "refs/tags/**",
], ],
@@ -2225,6 +2232,7 @@ def deploy(ctx, config, rebuild):
], ],
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/master",
"refs/tags/v*", "refs/tags/v*",
], ],
}, },
@@ -2329,7 +2337,7 @@ def genericCachePurge(flush_path):
], ],
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/master",
"refs/pull/**", "refs/pull/**",
], ],
"status": [ "status": [
@@ -2581,7 +2589,7 @@ def litmus(ctx, storage):
"depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]), "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]),
"trigger": { "trigger": {
"ref": [ "ref": [
"refs/heads/stable-*", "refs/heads/master",
"refs/pull/**", "refs/pull/**",
], ],
}, },
@@ -2887,8 +2895,5 @@ def k6LoadTests(ctx):
"event": [ "event": [
"cron", "cron",
], ],
"ref": [
"refs/heads/master",
],
}, },
}] }]
deployments/continuous-deployment-config/ocis_keycloak/released.yml
+1 -1
View File
@@ -32,7 +32,7 @@
env: env:
INSECURE: "false" INSECURE: "false"
TRAEFIK_ACME_MAIL: wkloucek@owncloud.com 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 OCIS_DOMAIN: ocis.ocis-keycloak.released.owncloud.works
KEYCLOAK_DOMAIN: keycloak.ocis-keycloak.released.owncloud.works KEYCLOAK_DOMAIN: keycloak.ocis-keycloak.released.owncloud.works
COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml
deployments/continuous-deployment-config/ocis_ldap/released.yml
+1 -1
View File
@@ -32,7 +32,7 @@
env: env:
INSECURE: "false" INSECURE: "false"
TRAEFIK_ACME_MAIL: wkloucek@owncloud.com 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 OCIS_DOMAIN: ocis.ocis-ldap.released.owncloud.works
LDAP_MANAGER_DOMAIN: ldap.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 COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml
deployments/continuous-deployment-config/ocis_traefik/released.yml
+1 -1
View File
@@ -32,7 +32,7 @@
env: env:
INSECURE: "false" INSECURE: "false"
TRAEFIK_ACME_MAIL: wkloucek@owncloud.com 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 OCIS_DOMAIN: ocis.ocis-traefik.released.owncloud.works
DEMO_USERS: "true" DEMO_USERS: "true"
INBUCKET_DOMAIN: mail.ocis-traefik.released.owncloud.works INBUCKET_DOMAIN: mail.ocis-traefik.released.owncloud.works
deployments/continuous-deployment-config/ocis_wopi/released.yml
+1 -1
View File
@@ -32,7 +32,7 @@
env: env:
INSECURE: "false" INSECURE: "false"
TRAEFIK_ACME_MAIL: wkloucek@owncloud.com 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 OCIS_DOMAIN: ocis.ocis-wopi.released.owncloud.works
COMPANION_DOMAIN: companion.ocis-wopi.released.owncloud.works COMPANION_DOMAIN: companion.ocis-wopi.released.owncloud.works
COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud COMPANION_IMAGE: owncloud/uppy-companion:3.12.13-owncloud
ocis-pkg/version/version.go
+1 -1
View File
@@ -16,7 +16,7 @@ var (
// LatestTag is the latest released version plus the dev meta version. // LatestTag is the latest released version plus the dev meta version.
// Will be overwritten by the release pipeline // Will be overwritten by the release pipeline
// Needs a manual change for every tagged release // 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. // Date indicates the build date.
// This has been removed, it looks like you can only replace static strings with recent go versions // This has been removed, it looks like you can only replace static strings with recent go versions
sonar-project.properties
+1 -1
View File
@@ -2,7 +2,7 @@
sonar.projectKey=owncloud_ocis sonar.projectKey=owncloud_ocis
sonar.organization=owncloud-1 sonar.organization=owncloud-1
sonar.projectName=ocis sonar.projectName=ocis
sonar.projectVersion=5.0.0-rc.4 sonar.projectVersion=5.1.0-prealpha
sonar.host.url=https://sonarcloud.io sonar.host.url=https://sonarcloud.io
# ===================================================== # =====================================================