feat: migrate from woodpecker to forgejo actions
All checks were successful
All checks were successful
This commit is contained in:
parent
adaa10b3d3
commit
a02f2d9e68
7 changed files with 134 additions and 150 deletions
38
.forgejo/workflows/package.yml
Normal file
38
.forgejo/workflows/package.yml
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
---
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- "v*"
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
|
||||||
|
build_wheel:
|
||||||
|
runs-on: docker
|
||||||
|
steps:
|
||||||
|
- uses: https://code.forgejo.org/actions/checkout@v4
|
||||||
|
- name: Build Python wheel
|
||||||
|
run: |
|
||||||
|
apt update; apt install -y python3-pip
|
||||||
|
pip3 install --break-system-packages -e .[test]
|
||||||
|
python3 setup.py egg_info bdist_wheel
|
||||||
|
- uses: https://git.kabelsalat.ch/s3lph/forgejo-action-wheel-package-upload@v3
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.API_USERNAME }}
|
||||||
|
password: ${{ secrets.API_PASSWORD }}
|
||||||
|
|
||||||
|
build_debian:
|
||||||
|
runs-on: docker
|
||||||
|
steps:
|
||||||
|
- uses: https://code.forgejo.org/actions/checkout@v4
|
||||||
|
- uses: https://git.kabelsalat.ch/s3lph/forgejo-action-python-debian-package@v5
|
||||||
|
with:
|
||||||
|
python_module: multischleuder
|
||||||
|
package_name: multischleuder
|
||||||
|
package_root: package/debian/multischleuder
|
||||||
|
package_output_path: package/debian
|
||||||
|
- uses: https://git.kabelsalat.ch/s3lph/forgejo-action-debian-package-upload@v2
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.API_USERNAME }}
|
||||||
|
password: ${{ secrets.API_PASSWORD }}
|
||||||
|
deb: "package/debian/*.deb"
|
77
.forgejo/workflows/test.yml
Normal file
77
.forgejo/workflows/test.yml
Normal file
|
@ -0,0 +1,77 @@
|
||||||
|
---
|
||||||
|
|
||||||
|
on: push
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
|
||||||
|
test:
|
||||||
|
runs-on: docker
|
||||||
|
steps:
|
||||||
|
- uses: https://code.forgejo.org/actions/checkout@v4
|
||||||
|
- name: Unit Tests
|
||||||
|
run: |
|
||||||
|
apt update; apt install -y python3-pip
|
||||||
|
pip3 install --break-system-packages -e .[test]
|
||||||
|
python3 -m coverage run --rcfile=setup.cfg -m unittest discover multischleuder
|
||||||
|
python3 -m coverage combine
|
||||||
|
python3 -m coverage report --rcfile=setup.cfg
|
||||||
|
|
||||||
|
codestyle:
|
||||||
|
runs-on: docker
|
||||||
|
steps:
|
||||||
|
- uses: https://code.forgejo.org/actions/checkout@v4
|
||||||
|
- name: Code Style
|
||||||
|
run: |
|
||||||
|
apt update; apt install -y python3-pip
|
||||||
|
pip3 install --break-system-packages -e .[test]
|
||||||
|
pycodestyle multischleuder
|
||||||
|
|
||||||
|
mypy:
|
||||||
|
runs-on: docker
|
||||||
|
steps:
|
||||||
|
- uses: https://code.forgejo.org/actions/checkout@v4
|
||||||
|
- name: Static Type Checks
|
||||||
|
run: |
|
||||||
|
apt update; apt install -y python3-pip
|
||||||
|
pip3 install --break-system-packages -e .[test]
|
||||||
|
pip3 install --break-system-packages types-PyYAML types-python-dateutil
|
||||||
|
mypy multischleuder
|
||||||
|
|
||||||
|
schleuder:
|
||||||
|
runs-on: docker
|
||||||
|
steps:
|
||||||
|
- uses: https://code.forgejo.org/actions/checkout@v4
|
||||||
|
- name: Integration Test against schleuder
|
||||||
|
run: |
|
||||||
|
echo "postfix postfix/mailname string example.org" | debconf-set-selections
|
||||||
|
echo "postfix postfix/main_mailer_type string 'Local only'" | debconf-set-selections
|
||||||
|
apt update; apt install --yes python3-pip schleuder schleuder-cli postfix patch
|
||||||
|
pip3 install --break-system-packages -e .[test]
|
||||||
|
/usr/lib/postfix/configure-instance.sh -
|
||||||
|
echo "virtual_alias_maps = static:root" >> /etc/postfix/main.cf
|
||||||
|
/usr/sbin/postmulti -i - -p start
|
||||||
|
schleuder-cli lists list || true
|
||||||
|
export CERT_FPR=$(schleuder cert fingerprint | cut -d' ' -f4)
|
||||||
|
echo " - '00000000000000000000000000000000'" >> /etc/schleuder/schleuder.yml
|
||||||
|
cat > ~/.schleuder-cli/schleuder-cli.yml <<EOF
|
||||||
|
host: localhost
|
||||||
|
port: 4443
|
||||||
|
tls_fingerprint: ${CERT_FPR}
|
||||||
|
api_key: '00000000000000000000000000000000'
|
||||||
|
EOF
|
||||||
|
/usr/bin/schleuder-api-daemon &
|
||||||
|
sleep 5 # wait for daemons to start
|
||||||
|
export API_DAEMON_PID=$!
|
||||||
|
test/prepare-schleuder.sh
|
||||||
|
pip3 install --break-system-packages -e .
|
||||||
|
python3 -c 'import os; print(os.listdir(".")); print(); print(os.listdir("test/"))'
|
||||||
|
python3 -m coverage run --rcfile=setup.cfg -m multischleuder --config test/multischleuder.yml --verbose
|
||||||
|
# Run a second time - should be idempotent and not trigger any new mails
|
||||||
|
python3 -m coverage run --rcfile=setup.cfg -m multischleuder --config test/multischleuder.yml --verbose
|
||||||
|
python3 -m coverage combine
|
||||||
|
python3 -m coverage report --rcfile=setup.cfg
|
||||||
|
sleep 5 # wait for mail delivery
|
||||||
|
test/report.py
|
||||||
|
kill -9 ${API_DAEMON_PID} || true
|
||||||
|
/usr/sbin/postmulti -i - -p stop
|
||||||
|
sleep 5 # wait for daemons to terminate
|
139
.woodpecker.yml
139
.woodpecker.yml
|
@ -1,139 +0,0 @@
|
||||||
---
|
|
||||||
|
|
||||||
steps:
|
|
||||||
|
|
||||||
test:
|
|
||||||
image: python:3.11-bookworm
|
|
||||||
group: test
|
|
||||||
commands:
|
|
||||||
- pip3 install -e .[test]
|
|
||||||
- python3 -m coverage run --rcfile=setup.cfg -m unittest discover multischleuder
|
|
||||||
|
|
||||||
codestyle:
|
|
||||||
image: python:3.11-bookworm
|
|
||||||
group: test
|
|
||||||
commands:
|
|
||||||
- pip3 install -e .[test]
|
|
||||||
- pycodestyle multischleuder
|
|
||||||
|
|
||||||
mypy:
|
|
||||||
image: python:3.11-bookworm
|
|
||||||
group: test
|
|
||||||
commands:
|
|
||||||
- pip3 install -e .[test]
|
|
||||||
- mypy --install-types --non-interactive multischleuder
|
|
||||||
- mypy multischleuder
|
|
||||||
|
|
||||||
schleuder:
|
|
||||||
image: python:3.11-bookworm
|
|
||||||
group: test
|
|
||||||
commands:
|
|
||||||
- pip3 install -e .[test]
|
|
||||||
- echo "postfix postfix/mailname string example.org" | debconf-set-selections
|
|
||||||
- echo "postfix postfix/main_mailer_type string 'Local only'" | debconf-set-selections
|
|
||||||
- apt update; apt install --yes schleuder schleuder-cli postfix patch
|
|
||||||
- /usr/lib/postfix/configure-instance.sh -
|
|
||||||
- echo "virtual_alias_maps = static:root" >> /etc/postfix/main.cf
|
|
||||||
- /usr/sbin/postmulti -i - -p start
|
|
||||||
- schleuder-cli lists list || true
|
|
||||||
- export CERT_FPR=$(schleuder cert fingerprint | cut -d' ' -f4)
|
|
||||||
- echo " - '00000000000000000000000000000000'" >> /etc/schleuder/schleuder.yml
|
|
||||||
- |
|
|
||||||
cat > ~/.schleuder-cli/schleuder-cli.yml <<EOF
|
|
||||||
host: localhost
|
|
||||||
port: 4443
|
|
||||||
tls_fingerprint: $${CERT_FPR}
|
|
||||||
api_key: '00000000000000000000000000000000'
|
|
||||||
EOF
|
|
||||||
- /usr/bin/schleuder-api-daemon &
|
|
||||||
- sleep 5 # wait for daemons to start
|
|
||||||
- export API_DAEMON_PID=$!
|
|
||||||
- test/prepare-schleuder.sh
|
|
||||||
- pip3 install -e .
|
|
||||||
- python3 -c 'import os; print(os.listdir(".")); print(); print(os.listdir("test/"))'
|
|
||||||
- python3 -m coverage run --rcfile=setup.cfg -m multischleuder --config test/multischleuder.yml --verbose
|
|
||||||
# Run a second time - should be idempotent and not trigger any new mails
|
|
||||||
- python3 -m coverage run --rcfile=setup.cfg -m multischleuder --config test/multischleuder.yml --verbose
|
|
||||||
- sleep 5 # wait for mail delivery
|
|
||||||
- test/report.py
|
|
||||||
- kill -9 $${API_DAEMON_PID} || true
|
|
||||||
- /usr/sbin/postmulti -i - -p stop
|
|
||||||
- sleep 5 # wait for daemons to terminate
|
|
||||||
|
|
||||||
coverage:
|
|
||||||
image: python:3.11-bookworm
|
|
||||||
group: integration
|
|
||||||
commands:
|
|
||||||
- pip3 install -e .[test]
|
|
||||||
- python3 -m coverage combine
|
|
||||||
- python3 -m coverage report --rcfile=setup.cfg
|
|
||||||
|
|
||||||
build_wheel:
|
|
||||||
image: python:3.11-bookworm
|
|
||||||
group: package
|
|
||||||
when:
|
|
||||||
- event: tag
|
|
||||||
secrets:
|
|
||||||
- GITEA_API_REPOSITORY_PYPI
|
|
||||||
- GITEA_API_USERNAME
|
|
||||||
- GITEA_API_PASSWORD
|
|
||||||
commands:
|
|
||||||
- pip3 install -e .[test]
|
|
||||||
- python3 setup.py egg_info bdist_wheel
|
|
||||||
- |
|
|
||||||
cat > ~/.pypirc <<EOF
|
|
||||||
[distutils]
|
|
||||||
index-servers = gitea
|
|
||||||
|
|
||||||
[gitea]
|
|
||||||
repository = $${GITEA_API_REPOSITORY_PYPI}
|
|
||||||
username = $${GITEA_API_USERNAME}
|
|
||||||
password = $${GITEA_API_PASSWORD}
|
|
||||||
EOF
|
|
||||||
- python3 -m twine upload --repository gitea dist/*.whl
|
|
||||||
|
|
||||||
build_debian:
|
|
||||||
image: python:3.11-bookworm
|
|
||||||
group: package
|
|
||||||
when:
|
|
||||||
- event: tag
|
|
||||||
secrets:
|
|
||||||
- GITEA_API_REPOSITORY_DEB
|
|
||||||
- GITEA_API_USERNAME
|
|
||||||
- GITEA_API_PASSWORD
|
|
||||||
commands:
|
|
||||||
- apt update; apt install -y lintian rsync sudo curl
|
|
||||||
- export MULTISCHLEUDER_VERSION=$(python -c 'import multischleuder; print(multischleuder.__version__)')
|
|
||||||
- |
|
|
||||||
(for version in $(cat CHANGELOG.md | grep '<!-- BEGIN CHANGES' | cut -d ' ' -f 4); do
|
|
||||||
echo -e "multischleuder ($${version}-1) stable; urgency=medium\n"
|
|
||||||
cat CHANGELOG.md | grep -A 1000 "<"'!'"-- BEGIN CHANGES $${version} -->" | grep -B 1000 "<"'!'"-- END CHANGES $${version} -->" | tail -n +2 | head -n -1 | sed -re 's/^-/ */g'
|
|
||||||
echo -e "\n -- s3lph <s3lph@kabelsalat.ch> $(date -R)\n"
|
|
||||||
done) > package/debian/multischleuder/usr/share/doc/multischleuder/changelog
|
|
||||||
- gzip -9n package/debian/multischleuder/usr/share/doc/multischleuder/changelog
|
|
||||||
- python3 setup.py egg_info install --root=package/debian/multischleuder/ --prefix=/usr --optimize=1
|
|
||||||
- cd package/debian
|
|
||||||
- sed -re "s/__MULTISCHLEUDER_VERSION__/$${MULTISCHLEUDER_VERSION}/g" -i multischleuder/DEBIAN/control
|
|
||||||
- mkdir -p multischleuder/usr/lib/python3/dist-packages/
|
|
||||||
- rsync -a multischleuder/usr/lib/python3.11/site-packages/ multischleuder/usr/lib/python3/dist-packages/
|
|
||||||
- rm -rf multischleuder/usr/lib/python3.11/site-packages
|
|
||||||
- find multischleuder/usr/lib/python3/dist-packages -name __pycache__ -exec rm -r {} \; 2>/dev/null || true
|
|
||||||
- find multischleuder/usr/lib/python3/dist-packages -name '*.pyc' -exec rm {} \;
|
|
||||||
- find multischleuder/usr/lib/python3/dist-packages -name '*.pyo' -exec rm {} \;
|
|
||||||
- sed -re 's$#!/usr/local/bin/python3$#!/usr/bin/python3$' -i multischleuder/usr/bin/multischleuder
|
|
||||||
- find multischleuder -type f -exec chmod 0644 {} \;
|
|
||||||
- find multischleuder -type d -exec chmod 755 {} \;
|
|
||||||
- >-
|
|
||||||
chmod +x
|
|
||||||
multischleuder/usr/bin/multischleuder
|
|
||||||
multischleuder/DEBIAN/postinst
|
|
||||||
multischleuder/DEBIAN/prerm
|
|
||||||
multischleuder/DEBIAN/postrm
|
|
||||||
- dpkg-deb --build multischleuder
|
|
||||||
- mv multischleuder.deb "multischleuder_$${MULTISCHLEUDER_VERSION}-1_all.deb"
|
|
||||||
- sudo -u nobody lintian "multischleuder_$${MULTISCHLEUDER_VERSION}-1_all.deb" || true
|
|
||||||
- >-
|
|
||||||
curl
|
|
||||||
--user "$${GITEA_API_USERNAME}:$${GITEA_API_PASSWORD}"
|
|
||||||
--upload-file "multischleuder_$${MULTISCHLEUDER_VERSION}-1_all.deb"
|
|
||||||
$${GITEA_API_REPOSITORY_DEB}
|
|
13
CHANGELOG.md
13
CHANGELOG.md
|
@ -1,5 +1,18 @@
|
||||||
# MultiSchleuder Changelog
|
# MultiSchleuder Changelog
|
||||||
|
|
||||||
|
<!-- BEGIN RELEASE v0.1.9 -->
|
||||||
|
## Version 0.1.9
|
||||||
|
|
||||||
|
Maintenance Release
|
||||||
|
|
||||||
|
### Changes
|
||||||
|
|
||||||
|
<!-- BEGIN CHANGES 0.1.9 -->
|
||||||
|
- Migrate from Woodpecker to Forgejo Actions
|
||||||
|
<!-- END CHANGES 0.1.9 -->
|
||||||
|
|
||||||
|
<!-- END RELEASE v0.1.9 -->
|
||||||
|
|
||||||
<!-- BEGIN RELEASE v0.1.8 -->
|
<!-- BEGIN RELEASE v0.1.8 -->
|
||||||
## Version 0.1.8
|
## Version 0.1.8
|
||||||
|
|
||||||
|
|
13
README.md
13
README.md
|
@ -1,10 +1,5 @@
|
||||||
# MultiSchleuder
|
# MultiSchleuder
|
||||||
|
|
||||||
[![pipeline status](https://gitlab.com/s3lph/multischleuder/badges/main/pipeline.svg)](https://gitlab.com/s3lph/multischleuder/-/commits/main)
|
|
||||||
[![coverage report](https://gitlab.com/s3lph/multischleuder/badges/main/coverage.svg)](https://gitlab.com/s3lph/multischleuder/-/commits/main)
|
|
||||||
[![latest release](https://gitlab.com/s3lph/multischleuder/-/badges/release.svg)](https://gitlab.com/s3lph/multischleuder/-/releases)
|
|
||||||
[![license](https://img.shields.io/badge/License-MIT-yellow.svg)](https://gitlab.com/s3lph/multischleuder/-/blob/main/LICENSE)
|
|
||||||
|
|
||||||
Automatically and periodically merge subscribers and keys of multiple [Schleuder][schleuder] lists into one.
|
Automatically and periodically merge subscribers and keys of multiple [Schleuder][schleuder] lists into one.
|
||||||
|
|
||||||
## Dependencies
|
## Dependencies
|
||||||
|
@ -15,7 +10,7 @@ Automatically and periodically merge subscribers and keys of multiple [Schleuder
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
You can find Debian packages and Python wheels over at [Releases][releases].
|
You can find Debian packages and Python wheels over at [Packages][packages].
|
||||||
|
|
||||||
## Configuration
|
## Configuration
|
||||||
|
|
||||||
|
@ -178,11 +173,11 @@ MultiSchleuder resolves conflicts in a simple, but primitive manner:
|
||||||
1. Then it checks whether a subscriber has more than one key. If so, the key used by the oldest subscription wins.
|
1. Then it checks whether a subscriber has more than one key. If so, the key used by the oldest subscription wins.
|
||||||
|
|
||||||
This is by no means a perfect solution.
|
This is by no means a perfect solution.
|
||||||
It does however yield consisitent results.
|
It does however yield consistent results.
|
||||||
In both cases, if configured to do so, MultiSchleuder will send a notification message to all subscribers involved in a conflict, encrypting it with all keys involved in the conflict.
|
In both cases, if configured to do so, MultiSchleuder will send a notification message to all subscribers involved in a conflict, encrypting it with all keys involved in the conflict.
|
||||||
If one or more keys are - for whatever reason - unusable, the message will not be encrypted.
|
If one or more keys are - for whatever reason - unusable, the message will not be encrypted.
|
||||||
This is a deliberate decision, since the amount of metadata possibly leaked from such a message is fairly small, and we consider it worth taking this risk, given that the other possibilty would be to not notify a subscriber when something potentially malicious is going on.
|
This is a deliberate decision, since the amount of metadata possibly leaked from such a message is fairly small, and we consider it worth taking this risk, given that the other possibility would be to not notify a subscriber when something potentially malicious is going on.
|
||||||
|
|
||||||
|
|
||||||
[schleuder]: https://schleuder.org/
|
[schleuder]: https://schleuder.org/
|
||||||
[releases]: https://gitlab.com/s3lph/multischleuder/-/releases
|
[packages]: https://git.kabelsalat.ch/s3lph/multischleuder/packages
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
|
|
||||||
__version__ = '0.1.8'
|
__version__ = '0.1.9'
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
Package: multischleuder
|
Package: multischleuder
|
||||||
Version: __MULTISCHLEUDER_VERSION__
|
Version: __VERSION__
|
||||||
Maintainer: s3lph <s3lph@kabelsalat.ch>
|
Maintainer: s3lph <s3lph@kabelsalat.ch>
|
||||||
Section: web
|
Section: web
|
||||||
Priority: optional
|
Priority: optional
|
||||||
|
|
Loading…
Reference in a new issue