Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run tests on Ubuntu 24.04 #1418

Merged
merged 3 commits into from
Jan 15, 2025
Merged

Run tests on Ubuntu 24.04 #1418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aefd124
ci: Run tests on Ubuntu 24.04
garberg Jan 10, 2025
2c091f7
ci: Install build-essential, pip3 install -I
garberg Jan 10, 2025
0838c0f
build: Don't use --prune
garberg Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:
jobs:
test:

runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
matrix:
install: [ pip, apt ]
Expand All @@ -38,6 +38,7 @@ jobs:

# Install dependencies for build and test
sudo apt install -y \
build-essential \
devscripts \
fakeroot \
debhelper \
Expand All @@ -54,7 +55,7 @@ jobs:
default-jdk \
gradle \
rename \
postgresql-14-ip4r
postgresql-16-ip4r

sudo service postgresql start
pg_isready
Expand All @@ -78,7 +79,7 @@ jobs:
if: ${{ matrix.install == 'pip' }}
run: |
# install nipap dependencies
sudo -H pip3 install -r nipap/requirements.txt
sudo -H pip3 install --break-system-packages -I -r nipap/requirements.txt
# SQL
sudo su -c "cd nipap/sql; PGPASSWORD=papin make install" postgres
# move configuration file into place
Expand All @@ -92,7 +93,7 @@ jobs:
# install pynipap
cd pynipap; sudo python3 setup.py install; cd ..
# install nipap-cli dependencies
sudo -H pip3 install -r nipap-cli/requirements.txt
sudo -H pip3 install --break-system-packages -r nipap-cli/requirements.txt
# start nipap backend
nipap/nipapd --no-pid-file -c /etc/nipap/nipap.conf -df 2>&1 > /tmp/nipap.log &

Expand Down
2 changes: 1 addition & 1 deletion nipap-cli/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ buildrpm:
builddeb:
# build the source package in the parent directory
# then rename it to project_version.orig.tar.gz
$(PYTHON) setup.py sdist --dist-dir=../ --prune
$(PYTHON) setup.py sdist --dist-dir=../
rename -f 's/$(PROJECT)-(.*)\.tar\.gz/$(PROJECT)_$$1\.orig\.tar\.gz/' ../*
# build the package
debuild -us -uc
Expand Down
2 changes: 1 addition & 1 deletion nipap-www/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ buildrpm:
builddeb:
# build the source package in the parent directory
# then rename it to project_version.orig.tar.gz
$(PYTHON) setup.py sdist --dist-dir=../ #--prune
$(PYTHON) setup.py sdist --dist-dir=../
rename -f 's/$(PROJECT)-(\d.*)\.tar\.gz/$(PROJECT)_$$1\.orig\.tar\.gz/' ../*
# build the package
debuild -us -uc -sa
Expand Down
2 changes: 1 addition & 1 deletion pynipap/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ buildrpm:
builddeb:
# build the source package in the parent directory
# then rename it to project_version.orig.tar.gz
$(PYTHON) setup.py sdist --dist-dir=../ --prune
$(PYTHON) setup.py sdist --dist-dir=../
rename -f 's/$(PROJECT)-(\d.*)\.tar\.gz/$(PROJECT)_$$1\.orig\.tar\.gz/' ../*
# build the package
debuild -us -uc
Expand Down
2 changes: 1 addition & 1 deletion whoisd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ buildrpm:
builddeb:
# build the source package in the parent directory
# then rename it to project_version.orig.tar.gz
$(PYTHON) setup.py sdist --dist-dir=../ --prune
$(PYTHON) setup.py sdist --dist-dir=../
rename -f 's/$(PROJECT)-(.*)\.tar\.gz/$(PROJECT)_$$1\.orig\.tar\.gz/' ../*
# build the package
debuild -us -uc
Expand Down
Loading