diff --git a/.circleci/config.yml b/.circleci/config.yml
index e2f53c7..98b1ed8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -47,21 +47,11 @@ jobs:
|| (sleep 15; apt-get -qq -o APT::Acquire::Retries=4 update)
sudo apt-get -qq -o APT::Acquire::Retries=4 -o Dpkg::Use-Pty=0 --no-install-recommends install \
ca-certificates \
+ cmake \
g++ \
git \
- gnupg \
make \
- pkg-config \
- wget
- wget -qO- https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \
- | gpg --dearmor - \
- | sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
- echo 'deb [arch=arm64 signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' \
- | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null
- sudo apt-get -qq -o APT::Acquire::Retries=4 update \
- || (sleep 15; apt-get -qq -o APT::Acquire::Retries=4 update)
- sudo apt-get -qq -o APT::Acquire::Retries=4 -o Dpkg::Use-Pty=0 --no-install-recommends install \
- cmake
+ pkgconf
sudo apt-get -qq -o Dpkg::Use-Pty=0 autoremove
sudo rm -rf /var/lib/apt/lists/*
environment:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index de443e6..c63889d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,7 +47,7 @@ on: # yamllint disable-line rule:truthy
jobs:
bazel_arch:
name: bazel arch latest
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-latest
container: archlinux:latest
steps:
- name: setup
@@ -70,30 +70,14 @@ jobs:
shell: bash
bazel_macos:
- name: bazel macos latest
- runs-on: macos-latest
+ name: bazel macos 14
+ runs-on: macos-14
steps:
- name: checkout
uses: actions/checkout@v4
- name: setup
run: |
- rm -f \
- /usr/local/bin/2to3 \
- /usr/local/bin/2to3-3.* \
- /usr/local/bin/go \
- /usr/local/bin/gofmt \
- /usr/local/bin/idle3 \
- /usr/local/bin/idle3.* \
- /usr/local/bin/pydoc3 \
- /usr/local/bin/pydoc3.* \
- /usr/local/bin/python3 \
- /usr/local/bin/python3.* \
- /usr/local/bin/python3-config \
- /usr/local/bin/python3.*-config \
- /usr/local/bin/python3.*-config \
- /usr/local/lib/libtcl8.*.dylib \
- /usr/local/lib/libtk8.*.dylib
- brew update-reset -q
+ brew update -q
brew upgrade -f -q
brew bundle install -q --no-lock
brew cleanup -q -s
@@ -108,8 +92,8 @@ jobs:
shell: zsh -efuo pipefail {0}
bazel_ubuntu:
- name: bazel ubuntu 22.04
- runs-on: ubuntu-22.04
+ name: bazel ubuntu latest
+ runs-on: ubuntu-latest
container: ubuntu:latest
steps:
- name: setup
@@ -126,9 +110,9 @@ jobs:
gnupg \
python-is-python3 \
wget
- wget -qO - https://bazel.build/bazel-release.pub.gpg 2>/dev/null | gpg --dearmor - \
- > /usr/share/keyrings/bazel-archive-keyring.gpg
- echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/bazel-archive-keyring.gpg] https://storage.googleapis.com/bazel-apt stable jdk1.8' \
+ wget -qO - https://bazel.build/bazel-release.pub.gpg 2>/dev/null \
+ | gpg --dearmor - > /usr/share/keyrings/bazel-archive-keyring.gpg
+ echo 'deb [signed-by=/usr/share/keyrings/bazel-archive-keyring.gpg] https://storage.googleapis.com/bazel-apt stable jdk1.8' \
> /etc/apt/sources.list.d/bazel.list
apt-get -qq -o APT::Acquire::Retries=4 update \
|| (sleep 15; apt-get -qq -o APT::Acquire::Retries=4 update)
@@ -148,7 +132,7 @@ jobs:
bzlmod_arch:
name: bzlmod arch latest
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-latest
container: archlinux:latest
steps:
- name: setup
@@ -171,30 +155,14 @@ jobs:
shell: bash
bzlmod_macos:
- name: bzlmod macos latest
- runs-on: macos-latest
+ name: bzlmod macos 14
+ runs-on: macos-14
steps:
- name: checkout
uses: actions/checkout@v4
- name: setup
run: |
- rm -f \
- /usr/local/bin/2to3 \
- /usr/local/bin/2to3-3.* \
- /usr/local/bin/go \
- /usr/local/bin/gofmt \
- /usr/local/bin/idle3 \
- /usr/local/bin/idle3.* \
- /usr/local/bin/pydoc3 \
- /usr/local/bin/pydoc3.* \
- /usr/local/bin/python3 \
- /usr/local/bin/python3.* \
- /usr/local/bin/python3-config \
- /usr/local/bin/python3.*-config \
- /usr/local/bin/python3.*-config \
- /usr/local/lib/libtcl8.*.dylib \
- /usr/local/lib/libtk8.*.dylib
- brew update-reset -q
+ brew update -q
brew upgrade -f -q
brew bundle install -q --no-lock
brew cleanup -q -s
@@ -209,8 +177,8 @@ jobs:
shell: zsh -efuo pipefail {0}
bzlmod_ubuntu:
- name: bzlmod ubuntu 22.04
- runs-on: ubuntu-22.04
+ name: bzlmod ubuntu latest
+ runs-on: ubuntu-latest
container: ubuntu:latest
steps:
- name: setup
@@ -227,9 +195,9 @@ jobs:
gnupg \
python-is-python3 \
wget
- wget -qO - https://bazel.build/bazel-release.pub.gpg 2>/dev/null | gpg --dearmor - \
- > /usr/share/keyrings/bazel-archive-keyring.gpg
- echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/bazel-archive-keyring.gpg] https://storage.googleapis.com/bazel-apt stable jdk1.8' \
+ wget -qO - https://bazel.build/bazel-release.pub.gpg 2>/dev/null \
+ | gpg --dearmor - > /usr/share/keyrings/bazel-archive-keyring.gpg
+ echo 'deb [signed-by=/usr/share/keyrings/bazel-archive-keyring.gpg] https://storage.googleapis.com/bazel-apt stable jdk1.8' \
> /etc/apt/sources.list.d/bazel.list
apt-get -qq -o APT::Acquire::Retries=4 update \
|| (sleep 15; apt-get -qq -o APT::Acquire::Retries=4 update)
@@ -248,9 +216,9 @@ jobs:
shell: bash
cmake_alpine:
- name: cmake alpine 3
- runs-on: ubuntu-22.04
- container: alpine:3
+ name: cmake alpine latest
+ runs-on: ubuntu-latest
+ container: alpine:latest
steps:
- name: setup
run: |
@@ -290,7 +258,7 @@ jobs:
cmake_arch:
name: cmake arch latest
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-latest
container: archlinux:latest
steps:
- name: setup
@@ -333,7 +301,7 @@ jobs:
cmake_fedora:
name: cmake fedora latest
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-latest
container: fedora:latest
steps:
- name: setup
@@ -378,29 +346,14 @@ jobs:
shell: bash
cmake_macos:
- name: cmake macos latest
- runs-on: macos-latest
+ name: cmake macos 14
+ runs-on: macos-14
steps:
- name: checkout
uses: actions/checkout@v4
- name: setup
run: |
- rm -f \
- /usr/local/bin/2to3 \
- /usr/local/bin/2to3-3.* \
- /usr/local/bin/go \
- /usr/local/bin/gofmt \
- /usr/local/bin/idle3 \
- /usr/local/bin/idle3.* \
- /usr/local/bin/pydoc3 \
- /usr/local/bin/pydoc3.* \
- /usr/local/bin/python3 \
- /usr/local/bin/python3.* \
- /usr/local/bin/python3-config \
- /usr/local/bin/python3.*-config \
- /usr/local/lib/libtcl8.*.dylib \
- /usr/local/lib/libtk8.*.dylib
- brew update-reset -q
+ brew update -q
brew upgrade -f -q
brew bundle install -q --no-lock
brew cleanup -q -s
@@ -433,7 +386,7 @@ jobs:
cmake_rockylinux:
name: cmake rockylinux 9
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-latest
container: rockylinux:9
steps:
- name: setup
@@ -480,9 +433,9 @@ jobs:
shell: bash
cmake_ubuntu:
- name: cmake ubuntu 22.04
- runs-on: ubuntu-22.04
- container: ubuntu:22.04
+ name: cmake ubuntu latest
+ runs-on: ubuntu-latest
+ container: ubuntu:latest
steps:
- name: setup
run: |
@@ -493,26 +446,15 @@ jobs:
apt-get -qq -o APT::Acquire::Retries=4 -o Dpkg::Use-Pty=0 \
--no-install-recommends install \
ca-certificates \
+ cmake \
doxygen \
- dpkg \
dpkg-dev \
file \
g++ \
git \
- gnupg \
graphviz \
make \
- pkg-config \
- wget
- wget -qO- https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \
- | gpg --dearmor - > /usr/share/keyrings/kitware-archive-keyring.gpg
- echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' \
- > /etc/apt/sources.list.d/kitware.list
- apt-get -qq -o APT::Acquire::Retries=4 update \
- || (sleep 15; apt-get -qq -o APT::Acquire::Retries=4 update)
- apt-get -qq -o APT::Acquire::Retries=4 -o Dpkg::Use-Pty=0 \
- --no-install-recommends install \
- cmake
+ pkgconf
apt-get -qq -o Dpkg::Use-Pty=0 autoremove
rm -rf /var/lib/apt/lists/*
env:
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 407d376..9dd3bc1 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -47,7 +47,7 @@ on: # yamllint disable-line rule:truthy
jobs:
analyze:
name: analyze
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v4
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15d984f..fb96db0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,10 +34,11 @@
#
#
-cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
project(HRVO
VERSION 1.1.0
DESCRIPTION "The Hybrid Reciprocal Velocity Obstacle"
+ HOMEPAGE_URL https://gamma.cs.unc.edu/HRVO/
LANGUAGES CXX)
list(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_SOURCE_DIR}/cmake/modules")
@@ -67,7 +68,6 @@ set(HRVO_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR})
set(HRVO_LIBRARY HRVO)
set(HRVO_NAME "HRVO Library")
-set(HRVO_HOMEPAGE_URL https://gamma.cs.unc.edu/HRVO/)
set(CMAKE_CXX_STANDARD 98)
set(CMAKE_CXX_STANDARD_REQUIRED OFF)
@@ -322,18 +322,18 @@ set(CPACK_SOURCE_STRIP_FILES ON)
set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
set(CPACK_DEBIAN_PACKAGE_DEPENDS)
-set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${HRVO_HOMEPAGE_URL})
+set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${PROJECT_HOMEPAGE_URL})
set(CPACK_DEBIAN_PACKAGE_SECTION contrib/devel)
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
set(CPACK_FREEBSD_PACKAGE_DEPS)
set(CPACK_FREEBSD_PACKAGE_LICENSE APACHE20)
-set(CPACK_FREEBSD_PACKAGE_WWW ${HRVO_HOMEPAGE_URL})
+set(CPACK_FREEBSD_PACKAGE_WWW ${PROJECT_HOMEPAGE_URL})
set(CPACK_RPM_FILE_NAME RPM-DEFAULT)
set(CPACK_RPM_PACKAGE_AUTOREQPROV ON)
set(CPACK_RPM_PACKAGE_LICENSE "ASL 2.0")
set(CPACK_RPM_PACKAGE_REQUIRES)
-set(CPACK_RPM_PACKAGE_URL ${HRVO_HOMEPAGE_URL})
+set(CPACK_RPM_PACKAGE_URL ${PROJECT_HOMEPAGE_URL})
include(CPack)
diff --git a/Dockerfile b/Dockerfile
index 10b1fe1..dd39e4b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker.io/docker/dockerfile:1
+
#
# Dockerfile
# HRVO Library
@@ -31,9 +33,9 @@
#
#
-FROM ubuntu:22.04
+FROM ubuntu:latest
LABEL org.opencontainers.image.authors="Jamie Snape, Jur van den Berg, Stephen J. Guy, and Dinesh Manocha"
-LABEL org.opencontainers.image.base.name="docker.io/library/ubuntu:22.04"
+LABEL org.opencontainers.image.base.name="docker.io/library/ubuntu:latest"
LABEL org.opencontainers.image.description="The Hybrid Reciprocal Velocity Obstacle"
LABEL org.opencontainers.image.licenses="Apache-2.0"
LABEL org.opencontainers.image.source="https://github.com/snape/HRVO/"
@@ -50,22 +52,23 @@ RUN export DEBIAN_FRONTEND=noninteractive \
ca-certificates \
clang \
clang-tidy \
+ cmake \
cmake-format \
cppcheck \
cpplint \
dirmngr \
doxygen \
- dpkg \
dpkg-dev \
file \
g++ \
gdb \
git \
- gnupg \
graphviz \
iwyu \
+ jsonlint \
lldb \
make \
+ markdownlint \
nano \
netbase \
ninja-build \
@@ -74,25 +77,9 @@ RUN export DEBIAN_FRONTEND=noninteractive \
python3 \
reuse \
strace \
- unzip \
valgrind \
- wget \
yamllint \
- zlib1g-dev \
- && wget -qO - https://bazel.build/bazel-release.pub.gpg | gpg --dearmor - \
- > /usr/share/keyrings/bazel-archive-keyring.gpg \
- && echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/bazel-archive-keyring.gpg] https://storage.googleapis.com/bazel-apt stable jdk1.8' \
- > /etc/apt/sources.list.d/bazel.list \
- && wget -qO - https://apt.kitware.com/keys/kitware-archive-latest.asc \
- | gpg --dearmor - > /usr/share/keyrings/kitware-archive-keyring.gpg \
- && echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu jammy main' \
- > /etc/apt/sources.list.d/kitware.list \
- && apt-get update -qq \
- && apt-get install --no-install-recommends -o Dpkg::Use-Pty=0 -qy \
- bazel \
- cmake \
&& rm -rf /var/lib/apt/lists/* \
&& npm install -g \
- @bazel/buildifier \
- jsonlint \
- markdownlint-cli
+ @bazel/bazelisk \
+ @bazel/buildifier
diff --git a/HRVO.pc.in b/HRVO.pc.in
index 170f07c..d5bf4d9 100644
--- a/HRVO.pc.in
+++ b/HRVO.pc.in
@@ -38,7 +38,7 @@ includedir=${prefix}/@HRVO_INCLUDE_DIR@
Name: @HRVO_NAME@
Description: @PROJECT_DESCRIPTION@
-URL: @HRVO_HOMEPAGE_URL@
+URL: @PROJECT_HOMEPAGE_URL@
Version: @PROJECT_VERSION@
Libs: -L${libdir} -l@HRVO_LIBRARY@
Cflags: -I${includedir}