From 878c297f3ff6bbc7a5fd9a51e6bf07efc65e6803 Mon Sep 17 00:00:00 2001 From: Gurkengewuerz Date: Mon, 1 Jun 2020 20:45:01 +0200 Subject: [PATCH] updated ci... such wow... --- .drone.yml | 34 +++++++++++++++++----------------- packages/makedeb.sh | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.drone.yml b/.drone.yml index 36cf6fb..2d0f04c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,21 +7,6 @@ platform: arch: amd64 steps: - - name: build-arch - image: archlinux/base:latest - volumes: - - name: cache - path: /release - commands: - - pacman -Sy && pacman -S --noconfirm base-devel git sudo wget - - "echo 'Set disable_coredump false' >> /etc/sudo.conf" - - "mkdir /home/build && useradd --home /home/build --shell=/bin/false build && usermod -L build && chown build:build /home/build && echo 'build ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && echo 'root ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers" - - cd /home/build && sudo -u build wget https://raw.githubusercontent.com/Gurkengewuerz/KShare/${DRONE_COMMIT_BRANCH}/packages/arch/${DRONE_COMMIT_BRANCH}-KShare/PKGBUILD - - cd /home/build && pwd && ls -lah - - cd /home/build && sudo -u build makepkg --syncdeps --noconfirm - - mkdir /release || true - - cp /home/build/*.pkg.tar.xz /release/ - - name: build-ubuntu image: buildpack-deps:19.10 volumes: @@ -36,9 +21,24 @@ steps: - cd build && pwd && ls; qmake ..; make -j2; cd .. - mkdir /release || true - cp build/src/kshare /release/ - - cd packages/; ./makedeb.sh ci; cp *.deb /release/; cd.. + - cd packages/; ./makedeb.sh ci; cp *.deb /release/; cd .. - rm -rf build/ + - name: build-arch + image: archlinux/base:latest + volumes: + - name: cache + path: /release + commands: + - pacman -Sy && pacman -S --noconfirm base-devel git sudo wget + - "echo 'Set disable_coredump false' >> /etc/sudo.conf" + - "mkdir /home/build && useradd --home /home/build --shell=/bin/false build && usermod -L build && chown build:build /home/build && echo 'build ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers && echo 'root ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers" + - cd /home/build && sudo -u build wget https://raw.githubusercontent.com/Gurkengewuerz/KShare/dev/packages/arch/dev-KShare/PKGBUILD + - cd /home/build && pwd && ls -lah + - cd /home/build && sudo -u build makepkg --syncdeps --noconfirm + - mkdir /release || true + - cp /home/build/*.pkg.tar.xz /release/ + - name: artifacts image: alpine:latest volumes: @@ -68,4 +68,4 @@ steps: volumes: - name: cache - temp: {} \ No newline at end of file + temp: {} diff --git a/packages/makedeb.sh b/packages/makedeb.sh index a7e8f58..0b400d5 100755 --- a/packages/makedeb.sh +++ b/packages/makedeb.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash VERSION=$(grep setApplicationVersion ../src/main.cpp | head -n1 | cut -d \" -f2) echo "Make Debian package for v$VERSION" >&2