fix release upload

owncloud-archive · Aug 23, 2019 · 3b8f0c8 · 3b8f0c8
1 parent b79000a
commit 3b8f0c8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 50 deletions.
diff --git a/.drone.starlark b/.drone.starlark
@@ -39,31 +39,6 @@ def pipeline_build_reva():
         ]
     }
 
-    return {
-        'kind': 'pipeline',
-        'name': 'build-reva',
-        'steps': [
-            step_build,
-            step_exec,
-            step_checksum,
-        ],
-    }
-
-
-def pipeline_release_reva():
-    base_dir = './build/reva'
-
-    step_publish_release = {
-        'name': 'publish-release',
-        'image': 'plugins/github-release',
-        'settings': {
-            'api_key': { 'from_secret': 'github_token'},
-            'overwrite': True,
-            'files': [base_dir + '/release/*'],
-            'title': "${DRONE_TAG}",
-        },
-    }
-
     # step_publish_daily = {
     #     'name': 'publish-daily',
     #     'image': 'plugins/github-release',
@@ -79,23 +54,34 @@ def pipeline_release_reva():
     #     },
     # }
 
+    step_publish_release = {
+        'name': 'publish-release',
+        'image': 'plugins/github-release',
+        'settings': {
+            'api_key': { 'from_secret': 'github_token'},
+            'overwrite': True,
+            'files': [base_dir + '/release/*'],
+            'title': "${DRONE_TAG}",
+        },
+    }
+
     return {
         'kind': 'pipeline',
-        'name': 'publish-reva',
+        'name': 'build-reva',
         'steps': [
+            step_build,
+            step_exec,
+            step_checksum,
             step_publish_release,
             # step_publish_daily,
         ],
-        'depends_on': [
-            "build-reva",
-        ],
-        'trigger': {
+        'when': {
             'ref': [ 'refs/tags/**' ],
         },
     }
 
+
 def main():
     return [
         pipeline_build_reva(),
-        pipeline_release_reva()
     ]
diff --git a/.drone.yml b/.drone.yml
@@ -32,33 +32,15 @@ steps:
   commands:
   - apk add --no-cache coreutils
   - "sha256sum -b ./build/reva/release/* > ./build/reva/release/sha256sum.txt"
-  - ls -l ./build/reva/release/
 
----
-kind: pipeline
-name: publish-reva
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
 - name: publish-release
   image: plugins/github-release
   settings:
     api_key:
       from_secret: github_token
     files:
-    - build/reva/release/revad
-    - build/reva/release/sha256sum.txt
+    - "./build/reva/release/*"
     overwrite: true
     title: "${DRONE_TAG}"
 
-trigger:
-  ref:
-  - "refs/tags/**"
-
-depends_on:
-- build-reva
-
 ...