From cf9feb44c485e7f9c60808bb95a189cce92939db Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Mon, 22 Apr 2024 23:08:25 -0400 Subject: [PATCH] ci: python3-minimal is insufficient Change-Id: I16e4ed2626ccfc68b5a28ab90bf6fabf1237eb7c --- .gitignore | 27 ++++++++++++++++----------- .jenkins.d/00-deps.sh | 5 +++-- INSTALL.md | 8 +++++--- README.md | 2 +- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 8850587..dc40a00 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,20 @@ -# Emacs +# Backup files *~ +*.bak +*.orig +*.rej + +# Waf build system +/build/ +.waf-*-*/ +.waf3-*-*/ +.lock-waf* + +# Compiled python code +__pycache__/ +*.py[cod] + +# Emacs \#*\# /.emacs.desktop /.emacs.desktop.lock @@ -15,15 +30,5 @@ .LSOverride ._* -# Waf build system -/build/ -.waf-*-*/ -.waf3-*-*/ -.lock-waf* - -# Compiled python code -__pycache__/ -*.py[cod] - # Other /VERSION.info diff --git a/.jenkins.d/00-deps.sh b/.jenkins.d/00-deps.sh index 2cda8fc..9a2b436 100755 --- a/.jenkins.d/00-deps.sh +++ b/.jenkins.d/00-deps.sh @@ -2,7 +2,8 @@ set -eo pipefail APT_PKGS=( - build-essential + dpkg-dev + g++ libboost-chrono-dev libboost-date-time-dev libboost-dev @@ -16,7 +17,7 @@ APT_PKGS=( libsqlite3-dev libssl-dev pkg-config - python3-minimal + python3 ) FORMULAE=(boost openssl pkg-config) PIP_PKGS=() diff --git a/INSTALL.md b/INSTALL.md index 8b45bcf..08070d0 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -10,9 +10,11 @@ To build in a terminal, change to the directory containing the repo-ng repository. Then enter: - ./waf configure - ./waf - sudo ./waf install +```shell +./waf configure +./waf +sudo ./waf install +``` This builds and installs `ndn-repo-ng` and related tools. diff --git a/README.md b/README.md index 1260249..41fd85c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # repo-ng: Next generation NDN repository -[![CI](https://github.com/named-data/repo-ng/actions/workflows/ci.yml/badge.svg)](https://github.com/named-data/repo-ng/actions/workflows/ci.yml) ![Language](https://img.shields.io/badge/C%2B%2B-17-blue) +[![CI](https://github.com/named-data/repo-ng/actions/workflows/ci.yml/badge.svg)](https://github.com/named-data/repo-ng/actions/workflows/ci.yml) **repo-ng** is an implementation of a Named Data Networking (NDN) data repository, and follows the [Repo protocol](https://redmine.named-data.net/projects/repo-ng/wiki/Repo_Protocol_Specification).