Merge pull request #1418 from garberg/ci_24.04

Run tests on Ubuntu 24.04

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ env:
 jobs:
   test:
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         install: [ pip, apt ]
@@ -38,6 +38,7 @@ jobs:
 
         # Install dependencies for build and test
         sudo apt install -y \
+          build-essential \
           devscripts \
           fakeroot \
           debhelper \
@@ -54,7 +55,7 @@ jobs:
           default-jdk \
           gradle \
           rename \
-          postgresql-14-ip4r
+          postgresql-16-ip4r
 
         sudo service postgresql start
         pg_isready
@@ -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
@@ -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 &
 

nipap-cli/Makefile

@@ -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

nipap-www/Makefile

@@ -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

pynipap/Makefile

@@ -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

whoisd/Makefile

@@ -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