From c8e103bba101bf7abbeb96fbd88514f701c7b4dc Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 4 Jul 2023 19:51:22 +0545 Subject: [PATCH] Remove special PR-based drone actions from CI --- .drone.star | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/.drone.star b/.drone.star index cb24d27b7..a857180b9 100644 --- a/.drone.star +++ b/.drone.star @@ -4,14 +4,12 @@ # images ALPINE_GIT = "alpine/git:latest" CHKO_DOCKER_PUSHRM = "chko/docker-pushrm:1" -DRONE_CLI = "drone/cli:alpine" INBUCKET_INBUCKET = "inbucket/inbucket" MINIO_MC = "minio/mc:RELEASE.2021-10-07T04-19-58Z" OC_CI_ALPINE = "owncloudci/alpine:latest" OC_CI_BAZEL_BUILDIFIER = "owncloudci/bazel-buildifier:latest" OC_CI_CLAMAVD = "owncloudci/clamavd" OC_CI_DRONE_ANSIBLE = "owncloudci/drone-ansible:latest" -OC_CI_DRONE_CANCEL_PREVIOUS_BUILDS = "owncloudci/drone-cancel-previous-builds" OC_CI_DRONE_SKIP_PIPELINE = "owncloudci/drone-skip-pipeline" OC_CI_GOLANG = "owncloudci/golang:1.20" OC_CI_NODEJS = "owncloudci/nodejs:%s" @@ -254,7 +252,6 @@ def main(ctx): pipelines = [] test_pipelines = \ - cancelPreviousBuilds() + \ codestyle(ctx) + \ buildWebCache(ctx) + \ getGoBinForTesting(ctx) + \ @@ -340,30 +337,6 @@ def testOcisModules(ctx): return pipelines + [scan_result_upload] -def cancelPreviousBuilds(): - return [{ - "kind": "pipeline", - "type": "docker", - "name": "cancel-previous-builds", - "clone": { - "disable": True, - }, - "steps": [{ - "name": "cancel-previous-builds", - "image": OC_CI_DRONE_CANCEL_PREVIOUS_BUILDS, - "settings": { - "DRONE_TOKEN": { - "from_secret": "drone_token", - }, - }, - }], - "trigger": { - "ref": [ - "refs/pull/**", - ], - }, - }] - def testPipelines(ctx): pipelines = [] @@ -1345,30 +1318,6 @@ def failEarly(ctx, early_fail): ], }, }, - { - "name": "stop-build", - "image": DRONE_CLI, - # # https://github.com/drone/runner-go/blob/0bd0f8fc31c489817572060d17c6e24aaa487470/pipeline/runtime/const.go#L95-L102 - # "failure": "fail-fast", - # would be an alternative, but is currently broken - "environment": { - "DRONE_SERVER": "https://drone.owncloud.com", - "DRONE_TOKEN": { - "from_secret": "drone_token", - }, - }, - "commands": [ - "drone build stop owncloud/ocis ${DRONE_BUILD_NUMBER}", - ], - "when": { - "status": [ - "failure", - ], - "event": [ - "pull_request", - ], - }, - }, ] return []