From 10fc9e4acd7961239e373423ebbc496f34ea0d9c Mon Sep 17 00:00:00 2001
From: Olivier 'reivilibre <olivier@librepush.net>
Date: Mon, 8 Nov 2021 13:14:16 +0000
Subject: [PATCH] CI fixups and simplifications

---
 .woodpecker.yml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index c58d7b2..3d33d2e 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -6,12 +6,10 @@ pipeline:
       event: [push, pull_request]
     image: rust:1.56.1-slim
     commands:
-      - "dir=`echo $DRONE_REPO_NAME-$DRONE_TAG-${DRONE_ARCH/\\//-} | sed s%/%-%`"
-      - "echo $dir"
-      #- apt-get -qq update && apt-get -yqq install pkg-config libssl-dev build-essential libolm-dev cmake
+      - apt-get -qq update && apt-get -yqq install pkg-config libssl-dev build-essential libolm-dev cmake
       #- rustup component add clippy
       # TODO clippy one day
-      #- cargo check
+      - cargo check
 
   buildRelease:
     when:
@@ -19,14 +17,11 @@ pipeline:
       tag: v*
     image: rust:1.56.1-slim
     commands:
-      #- apt-get -qq update && apt-get -yqq install pkg-config libssl-dev build-essential libolm-dev cmake
-      #- cargo build --release
-      - "dir=$DRONE_REPO_NAME-$DRONE_TAG-${DRONE_ARCH/\\//-}"
-      - "mkdir $dir"
-      - cp target/release/mxmonzo $dir/
-      - tar cvf $dir.tar.gz $dir
+      - apt-get -qq update && apt-get -yqq install pkg-config libssl-dev build-essential libolm-dev cmake
+      - cargo build --release
+      - "qualname=`echo $DRONE_REPO_NAME-$DRONE_TAG-${DRONE_ARCH/\\//-} | sed s%/%-%`"
       - mkdir dist
-      - mv $dir.tar.gz dist/
+      - cp target/release/mxmonzo dist/$qualname
 
   uploadRelease:
     when: