diff --git a/.drone.yml b/.drone.yml index 9c5a8b3..e6a1fc3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ kind: pipeline type: docker -name: default +name: almalinux8 trigger: event: @@ -9,22 +9,9 @@ trigger: - pull_request steps: - - name: build_el8 - image: almalinux:8.10 + - name: build + image: git.query.consul/unkin/almalinux8:latest commands: - # Remove default repos - - rm -rf /etc/yum.repos.d/*.repo - - # Add edgecache repos - - echo -e "[epel]\nname=epel repository\nbaseurl=http://edgecache.query.consul/epel/8/Everything/x86_64\ngpgkey=http://edgecache.query.consul/epel/RPM-GPG-KEY-EPEL-8\nenabled=1\ngpgcheck=1" > /etc/yum.repos.d/epel.repo - - echo -e "[baseos]\nname=baseos repository\nbaseurl=http://edgecache.query.consul/almalinux/8.10/BaseOS/x86_64/os\ngpgkey=http://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8\nenabled=1\ngpgcheck=1" > /etc/yum.repos.d/baseos.repo - - echo -e "[appstream]\nname=appstream repository\nbaseurl=http://edgecache.query.consul/almalinux/8.10/AppStream/x86_64/os\ngpgkey=http://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8\nenabled=1\ngpgcheck=1" > /etc/yum.repos.d/appstream.repo - - echo -e "[powertools]\nname=powertools repository\nbaseurl=http://edgecache.query.consul/almalinux/8.10/PowerTools/x86_64/os\ngpgkey=http://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-8\nenabled=1\ngpgcheck=1" > /etc/yum.repos.d/powertools.repo - - # Clean and update repository cache - - dnf clean all - - dnf makecache - # Install RPMFusion - dnf install -y --nogpgcheck https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-$(rpm -E %rhel).noarch.rpm - dnf install -y --nogpgcheck https://mirrors.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-$(rpm -E %rhel).noarch.rpm @@ -35,15 +22,15 @@ steps: # Run the `make` command - make build - - name: upload_el8 - image: curlimages/curl:latest + - name: upload + image: git.query.consul/unkin/almalinux8:latest environment: - GITEA_TOKEN: - from_secret: gitea_package_token + GITEA_PASSWORD: + from_secret: gitea_password 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 + curl --user droneci:$GITEA_PASSWORD --upload-file $rpm https://git.query.consul/api/packages/unkin/rpm/almalinux/el8/upload done when: branch: diff --git a/gonic.spec b/gonic.spec index 8464efa..283ff90 100644 --- a/gonic.spec +++ b/gonic.spec @@ -15,7 +15,7 @@ Requires: golang, git, sqlite, taglib, ffmpeg, mpv, systemd %description Gonic is a lightweight music streaming server written in Go. -%global debug_package %{nil} +%global debug_package %{nil} %prep %autosetup -n %{name}-%{version}