refactor: migrate to forgejo

This commit is contained in:
2026-03-07 12:50:53 +01:00
parent 995b60af81
commit dc894293b6
6 changed files with 75 additions and 62 deletions

View File

@@ -0,0 +1,19 @@
name: Continuous Delivery
on:
push:
tags:
- "v[0-9]+.[0-9]+.[0-9]+"
jobs:
build_n_upload:
runs-on: linux
steps:
- uses: actions/checkout@v6
with:
fetch-tags: true
- run: make tarball
- run: rpmbuild -ba "$(make name).spec"
- run: make upload
env:
PKG_TOKEN: ${{ secrets.PKG_TOKEN }}

View File

@@ -0,0 +1,17 @@
name: Continuous Integration
on:
push:
branches:
- main
jobs:
lint_n_build:
runs-on: linux
steps:
- uses: actions/checkout@v6
with:
fetch-tags: true
- run: shellcheck files/sbin/certbot_renew
- run: make tarball
- run: rpmbuild -ba "$(make name).spec"

View File

@@ -1,26 +0,0 @@
name: Continuous Delivery
on:
push:
tags:
- "v[0-9]+.[0-9]+.[0-9]+"
jobs:
build_n_upload:
runs-on: linux
steps:
- name: Git checkout
uses: actions/checkout@v6
with:
fetch-tags: true
- name: Build tarball
run: make tarball
env:
GIT_REFERENCE: ${{ github.ref }}
- name: Build rpm package
run: rpmbuild -ba "$(make name).spec"
- name: Upload rpm package
run: make upload
env:
GIT_PACKAGES_USERNAME: ${{ vars.GIT_PACKAGES_USERNAME }}
GIT_PACKAGES_TOKEN: ${{ secrets.GIT_PACKAGES_TOKEN }}

View File

@@ -1,22 +0,0 @@
name: Continuous Integration
on:
push:
branches:
- main
jobs:
lint_n_build:
runs-on: linux
steps:
- name: Git checkout
uses: actions/checkout@v6
with:
fetch-depth: 0
fetch-tags: true
- name: Lint shell scripts
run: shellcheck files/sbin/certbot_renew
- name: Build tarball
run: make tarball
- name: Build rpm file
run: rpmbuild -ba netoik-rp.spec

View File

@@ -1,16 +1,21 @@
NAME = netoik-rp NAME = netoik-rp
VERSION = $(shell git describe --abbrev=0) VERSION = $(shell git describe --abbrev=0)
RELEASE = $(shell git rev-parse --short HEAD) RELEASE = $(shell git rev-parse --short HEAD)
REFERENCE = $(if $(GIT_REFERENCE),$(GIT_REFERENCE),$(shell git branch --show-current)) ARCH = noarch
BUILD_ARCH = noarch OWNER = samuel
SUMMARY = "Netoïk Reverse Proxy"
LICENSE = "MIT"
URL = "https://git.netoik.io/$(OWNER)/$(NAME)"
SOURCE0 = "$(NAME)-$(VERSION)-$(RELEASE).tar.gz"
RPM_RPMDIR = $(shell rpm --eval '%{_rpmdir}') RPM_RPMDIR = $(shell rpm --eval '%{_rpmdir}')
RPM_SBINDIR = $(shell rpm --eval '%{_sbindir}') RPM_SBINDIR = $(shell rpm --eval '%{_sbindir}')
RPM_SOURCEDIR = $(shell rpm --eval '%{_sourcedir}') RPM_SOURCEDIR = $(shell rpm --eval '%{_sourcedir}')
RPM_SYSCONFDIR = $(shell rpm --eval '%{_sysconfdir}') RPM_SYSCONFDIR = $(shell rpm --eval '%{_sysconfdir}')
RPM_UNITDIR = $(shell rpm --eval '%{_unitdir}') RPM_UNITDIR = $(shell rpm --eval '%{_unitdir}')
RPM_TARBALL_PATH = $(RPM_SOURCEDIR)/$(NAME)-$(VERSION).tar.gz
RPM_BUILD_PATH = $(RPM_RPMDIR)/$(BUILD_ARCH)/$(NAME)-$(VERSION)-$(RELEASE).$(BUILD_ARCH).rpm RPM_TARBALL_PATH = $(RPM_SOURCEDIR)/$(SOURCE0)
RPM_BUILD_PATH = $(RPM_RPMDIR)/$(BUILD_ARCH)/$(NAME)-$(VERSION)-$(RELEASE).$(ARCH).rpm
.PHONY: name .PHONY: name
name: name:
@@ -24,9 +29,29 @@ version:
release: release:
@echo "$(RELEASE)" @echo "$(RELEASE)"
.PHONY: build_arch .PHONY: arch
build_arch: arch:
@echo "$(BUILD_ARCH)" @echo "$(ARCH)"
.PHONY: owner
owner:
@echo "$(OWNER)"
.PHONY: summary
summary:
@echo "$(SUMMARY)"
.PHONY: license
license:
@echo "$(LICENSE)"
.PHONY: url
url:
@echo "$(URL)"
.PHONY: source0
source0:
@echo "$(SOURCE0)"
.PHONY: install .PHONY: install
install: install:
@@ -41,11 +66,11 @@ $(RPM_TARBALL_PATH): *
--output="$@" \ --output="$@" \
--prefix="$(NAME)-$(VERSION)/" \ --prefix="$(NAME)-$(VERSION)/" \
--verbose \ --verbose \
"$(REFERENCE)" HEAD
.PHONY: tarball .PHONY: tarball
tarball: $(RPM_TARBALL_PATH) tarball: $(RPM_TARBALL_PATH)
.PHONY: upload .PHONY: upload
upload: upload:
curl --fail-with-body --upload-file "$(RPM_BUILD_PATH)" --user "$(GIT_PACKAGES_USERNAME):$(GIT_PACKAGES_TOKEN)" https://git.netoik.io/api/packages/samuel/rpm/upload curl --fail-with-body --upload-file "$(RPM_BUILD_PATH)" --user "$(OWNER):$(PKG_TOKEN)" https://git.netoik.io/api/packages/$(OWNER)/rpm/upload

View File

@@ -3,12 +3,12 @@
Name: %(make name) Name: %(make name)
Version: %(make version) Version: %(make version)
Release: %(make release) Release: %(make release)
Summary: Netoik Reverse Proxy Summary: %(make summary)
License: MIT License: %(make license)
URL: https://git.netoik.io/samuel/netoik-rp URL: %(make url)
Source0: %{name}-%{version}.tar.gz Source0: %(make source0)
Buildarch: %(make build_arch) Buildarch: %(make arch)
BuildRequires: make BuildRequires: make
Requires: nginx python3 python-devel (augeas-devel or augeas-libs) gcc openssl Requires: nginx python3 python-devel (augeas-devel or augeas-libs) gcc openssl