mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-18 10:09:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

chore: revert changes that are not needed from master

Browse Source
This commit is contained in:
Benedikt Kulmann
2024-02-15 16:40:26 +01:00
parent 1471ae262e
commit 9cbeb14f1c
3 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
.drone.star
View File

@@ -302,7 +302,7 @@ def cachePipeline(name, steps):
"steps": steps,
"trigger": {
"ref": [
"refs/heads/master",
"refs/heads/stable-*",
"refs/tags/**",
"refs/pull/**",
],
@@ -362,7 +362,6 @@ def getGoBinForTesting(ctx):
cacheGoBin(),
"trigger": {
"ref": [
"refs/heads/master",
"refs/heads/stable-*",
"refs/pull/**",
],
@@ -501,7 +500,7 @@ def testOcis(ctx):
"steps": steps,
"trigger": {
"ref": [
"refs/heads/master",
"refs/heads/stable-*",
"refs/pull/**",
],
},
@@ -557,7 +556,7 @@ def buildOcisBinaryForTesting(ctx):
rebuildBuildArtifactCache(ctx, "ocis-binary-amd64", "ocis/bin"),
"trigger": {
"ref": [
"refs/heads/master",
"refs/heads/stable-*",
"refs/pull/**",
],
},
@@ -644,7 +643,7 @@ def uploadScanResults(ctx):
],
"trigger": {
"ref": [
"refs/heads/master",
"refs/heads/stable-*",
"refs/pull/**",
],
"status": [
@@ -758,7 +757,7 @@ def codestyle(ctx):
"depends_on": [],
"trigger": {
"ref": [
"refs/heads/master",
"refs/heads/stable-*",
"refs/pull/**",
"refs/tags/**",
],
@@ -812,7 +811,7 @@ def localApiTestPipeline(ctx):
"depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]),
"trigger": {
"ref": [
"refs/heads/master",
"refs/heads/stable-*",
"refs/pull/**",
],
},
@@ -872,7 +871,7 @@ def cs3ApiTests(ctx, storage, accounts_hash_difficulty = 4):
"depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]),
"trigger": {
"ref": [
"refs/heads/master",
"refs/heads/stable-*",
"refs/pull/**",
],
},
@@ -979,7 +978,7 @@ def wopiValidatorTests(ctx, storage, accounts_hash_difficulty = 4):
"depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]),
"trigger": {
"ref": [
"refs/heads/master",
"refs/heads/stable-*",
"refs/pull/**",
],
},
@@ -1028,7 +1027,7 @@ def coreApiTests(ctx, part_number = 1, number_of_parts = 1, storage = "ocis", ac
"depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]),
"trigger": {
"ref": [
"refs/heads/master",
"refs/heads/stable-*",
"refs/pull/**",
],
},
@@ -1152,7 +1151,7 @@ def uiTestPipeline(ctx, filterTags, runPart = 1, numberOfParts = 1, storage = "o
"depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)] + buildWebCache(ctx)),
"trigger": {
"ref": [
"refs/heads/master",
"refs/heads/stable-*",
"refs/pull/**",
],
},
@@ -1176,7 +1175,7 @@ def e2eTests(ctx):
e2e_trigger = {
"ref": [
"refs/heads/master",
"refs/heads/stable-*",
"refs/tags/**",
"refs/pull/**",
],
@@ -1385,7 +1384,7 @@ def dockerRelease(ctx, arch):
"depends_on": depends_on,
"trigger": {
"ref": [
"refs/heads/master",
"refs/heads/stable-*",
"refs/tags/v*",
"refs/pull/**",
],
@@ -1462,7 +1461,6 @@ def binaryRelease(ctx, name):
],
"when": {
"ref": [
"refs/heads/master",
"refs/tags/v*",
],
},
@@ -1473,7 +1471,6 @@ def binaryRelease(ctx, name):
"settings": settings,
"when": {
"ref": [
"refs/heads/master",
"refs/tags/v*",
],
},
@@ -1516,7 +1513,7 @@ def binaryRelease(ctx, name):
"depends_on": depends_on,
"trigger": {
"ref": [
"refs/heads/master",
"refs/heads/stable-*",
"refs/tags/v*",
"refs/pull/**",
],
@@ -1608,7 +1605,6 @@ def licenseCheck(ctx):
"settings": settings,
"when": {
"ref": [
"refs/heads/master",
"refs/tags/v*",
],
},
@@ -1618,7 +1614,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", "").split("-")[0],
"make changelog CHANGELOG_VERSION=%s" % ctx.build.ref.replace("refs/tags/v", ""),
],
"when": {
"ref": [
@@ -1650,7 +1646,6 @@ def licenseCheck(ctx):
],
"trigger": {
"ref": [
"refs/heads/master",
"refs/tags/v*",
"refs/pull/**",
],
@@ -1686,7 +1681,6 @@ def releaseDockerManifest():
],
"trigger": {
"ref": [
"refs/heads/master",
"refs/tags/v*",
],
},
@@ -1733,7 +1727,7 @@ def changelog():
"push",
],
"message": "Automated changelog update [skip ci]",
"branch": "master",
"branch": "stable-5.0",
"author_email": "devops@owncloud.com",
"author_name": "ownClouders",
"netrc_machine": "github.com",
@@ -1755,7 +1749,7 @@ def changelog():
],
"trigger": {
"ref": [
"refs/heads/master",
"refs/heads/stable-*",
"refs/pull/**",
],
},
@@ -1789,7 +1783,6 @@ def releaseDockerReadme(ctx):
],
"trigger": {
"ref": [
"refs/heads/master",
"refs/tags/v*",
],
},
@@ -1839,7 +1832,7 @@ def docs():
},
"pages_directory": "docs/hugo/content/",
"copy_contents": "true",
"target_branch": "docs",
"target_branch": "docs-stable-5.0",
"delete": "true",
},
"when": {
@@ -1861,7 +1854,7 @@ def docs():
],
"trigger": {
"ref": [
"refs/heads/master",
"refs/heads/stable-*",
"refs/pull/**",
],
},
@@ -1927,7 +1920,7 @@ def notify():
"depends_on": [],
"trigger": {
"ref": [
"refs/heads/master",
"refs/heads/stable-*",
"refs/heads/release*",
"refs/tags/**",
],
@@ -2232,7 +2225,6 @@ def deploy(ctx, config, rebuild):
],
"trigger": {
"ref": [
"refs/heads/master",
"refs/tags/v*",
],
},
@@ -2337,7 +2329,7 @@ def genericCachePurge(flush_path):
],
"trigger": {
"ref": [
"refs/heads/master",
"refs/heads/stable-*",
"refs/pull/**",
],
"status": [
@@ -2589,7 +2581,7 @@ def litmus(ctx, storage):
"depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]),
"trigger": {
"ref": [
"refs/heads/master",
"refs/heads/stable-*",
"refs/pull/**",
],
},
@@ -2895,5 +2887,8 @@ def k6LoadTests(ctx):
"event": [
"cron",
],
"ref": [
"refs/heads/master",
],
},
}]

2
ocis-pkg/version/version.go
View File

@@ -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.1.0-prealpha+dev"
LatestTag = "5.0.0-rc.4+dev"
// Date indicates the build date.
// This has been removed, it looks like you can only replace static strings with recent go versions

2
sonar-project.properties
View File

@@ -2,7 +2,7 @@
sonar.projectKey=owncloud_ocis
sonar.organization=owncloud-1
sonar.projectName=ocis
sonar.projectVersion=5.1.0-prealpha
sonar.projectVersion=5.0.0-rc.4
sonar.host.url=https://sonarcloud.io
# =====================================================