From 6160593395a8a937d38e0da928117ad2d5db55d3 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sun, 25 Aug 2024 15:12:08 +1000 Subject: [PATCH] feat: add deploy steps - add deployment steps to droneci - update makefile to use droneci workspace --- .drone.yml | 26 ++++++++++++++++++++++---- Makefile | 4 ++-- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index a1ae39f..9c5a8b3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,11 +3,13 @@ type: docker name: default trigger: - branch: - - master + event: + include: + - push + - pull_request steps: - - name: build + - name: build_el8 image: almalinux:8.10 commands: # Remove default repos @@ -31,4 +33,20 @@ steps: - dnf install -y golang gcc gcc-c++ make git sqlite-devel taglib-devel ffmpeg mpv rpmdevtools wget systemd sqlite taglib # Run the `make` command - - make + - make build + + - name: upload_el8 + image: curlimages/curl:latest + environment: + GITEA_TOKEN: + from_secret: gitea_package_token + commands: + - > + for rpm in /drone/src/rpmbuild/RPMS/*/*.rpm; do + curl --user droneci:${GITEA_TOKEN} --upload-file $rpm https://git.query.consul/api/v1/packages/unkin/rpm/almalinux/el8/upload + done + when: + branch: + - master + event: + - push diff --git a/Makefile b/Makefile index 9b948ea..a409e94 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .PHONY: all prep download build clean -RPMBUILD := $(HOME)/rpmbuild +RPMBUILD := /drone/src/rpmbuild SOURCES := $(RPMBUILD)/SOURCES SPECS := $(RPMBUILD)/SPECS SPECFILE := gonic.spec @@ -23,7 +23,7 @@ download: prep build: $(SPECFILE) download @echo "Building RPM..." - @rpmbuild -ba $(SPECFILE) + @rpmbuild -ba --define "_topdir $(RPMBUILD)" $(SPECFILE) @echo "RPM built." clean: