Skip to content

Commit 2dcda3d

Browse files
snapesnape
committed
Update Ubuntu and CMake versions
1 parent 6eb4a23 commit 2dcda3d

File tree

6 files changed

+52
-130
lines changed

6 files changed

+52
-130
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,11 @@ jobs:
4747
|| (sleep 15; apt-get -qq -o APT::Acquire::Retries=4 update)
4848
sudo apt-get -qq -o APT::Acquire::Retries=4 -o Dpkg::Use-Pty=0 --no-install-recommends install \
4949
ca-certificates \
50+
cmake \
5051
g++ \
5152
git \
52-
gnupg \
5353
make \
54-
pkg-config \
55-
wget
56-
wget -qO- https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \
57-
| gpg --dearmor - \
58-
| sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
59-
echo 'deb [arch=arm64 signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' \
60-
| sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null
61-
sudo apt-get -qq -o APT::Acquire::Retries=4 update \
62-
|| (sleep 15; apt-get -qq -o APT::Acquire::Retries=4 update)
63-
sudo apt-get -qq -o APT::Acquire::Retries=4 -o Dpkg::Use-Pty=0 --no-install-recommends install \
64-
cmake
54+
pkgconf
6555
sudo apt-get -qq -o Dpkg::Use-Pty=0 autoremove
6656
sudo rm -rf /var/lib/apt/lists/*
6757
environment:

‎.github/workflows/ci.yml‎

Lines changed: 32 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ on: # yamllint disable-line rule:truthy
4747
jobs:
4848
bazel_arch:
4949
name: bazel arch latest
50-
runs-on: ubuntu-22.04
50+
runs-on: ubuntu-latest
5151
container: archlinux:latest
5252
steps:
5353
- name: setup
@@ -70,29 +70,14 @@ jobs:
7070
shell: bash
7171

7272
bazel_macos:
73-
name: bazel macos latest
74-
runs-on: macos-latest
73+
name: bazel macos 14
74+
runs-on: macos-14
7575
steps:
7676
- name: checkout
7777
uses: actions/checkout@v4
7878
- name: setup
7979
run: |
80-
rm -f \
81-
/usr/local/bin/2to3 \
82-
/usr/local/bin/2to3-3.* \
83-
/usr/local/bin/go \
84-
/usr/local/bin/gofmt \
85-
/usr/local/bin/idle3 \
86-
/usr/local/bin/idle3.* \
87-
/usr/local/bin/pydoc3 \
88-
/usr/local/bin/pydoc3.* \
89-
/usr/local/bin/python3 \
90-
/usr/local/bin/python3.* \
91-
/usr/local/bin/python3-config \
92-
/usr/local/bin/python3.*-config \
93-
/usr/local/lib/libtcl8.*.dylib \
94-
/usr/local/lib/libtk8.*.dylib
95-
brew update-reset -q
80+
brew update -q
9681
brew upgrade -f -q
9782
brew bundle install -q --no-lock
9883
brew cleanup -q -s
@@ -107,8 +92,8 @@ jobs:
10792
shell: zsh -efuo pipefail {0}
10893

10994
bazel_ubuntu:
110-
name: bazel ubuntu 22.04
111-
runs-on: ubuntu-22.04
95+
name: bazel ubuntu latest
96+
runs-on: ubuntu-latest
11297
container: ubuntu:latest
11398
steps:
11499
- name: setup
@@ -125,9 +110,9 @@ jobs:
125110
gnupg \
126111
python-is-python3 \
127112
wget
128-
wget -qO - https://bazel.build/bazel-release.pub.gpg 2>/dev/null | gpg --dearmor - \
129-
> /usr/share/keyrings/bazel-archive-keyring.gpg
130-
echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/bazel-archive-keyring.gpg] https://storage.googleapis.com/bazel-apt stable jdk1.8' \
113+
wget -qO - https://bazel.build/bazel-release.pub.gpg 2>/dev/null \
114+
| gpg --dearmor - > /usr/share/keyrings/bazel-archive-keyring.gpg
115+
echo 'deb [signed-by=/usr/share/keyrings/bazel-archive-keyring.gpg] https://storage.googleapis.com/bazel-apt stable jdk1.8' \
131116
> /etc/apt/sources.list.d/bazel.list
132117
apt-get -qq -o APT::Acquire::Retries=4 update \
133118
|| (sleep 15; apt-get -qq -o APT::Acquire::Retries=4 update)
@@ -147,7 +132,7 @@ jobs:
147132

148133
bzlmod_arch:
149134
name: bzlmod arch latest
150-
runs-on: ubuntu-22.04
135+
runs-on: ubuntu-latest
151136
container: archlinux:latest
152137
steps:
153138
- name: setup
@@ -170,29 +155,14 @@ jobs:
170155
shell: bash
171156

172157
bzlmod_macos:
173-
name: bzlmod macos latest
174-
runs-on: macos-latest
158+
name: bzlmod macos 14
159+
runs-on: macos-14
175160
steps:
176161
- name: checkout
177162
uses: actions/checkout@v4
178163
- name: setup
179164
run: |
180-
rm -f \
181-
/usr/local/bin/2to3 \
182-
/usr/local/bin/2to3-3.* \
183-
/usr/local/bin/go \
184-
/usr/local/bin/gofmt \
185-
/usr/local/bin/idle3 \
186-
/usr/local/bin/idle3.* \
187-
/usr/local/bin/pydoc3 \
188-
/usr/local/bin/pydoc3.* \
189-
/usr/local/bin/python3 \
190-
/usr/local/bin/python3.* \
191-
/usr/local/bin/python3-config \
192-
/usr/local/bin/python3.*-config \
193-
/usr/local/lib/libtcl8.*.dylib \
194-
/usr/local/lib/libtk8.*.dylib
195-
brew update-reset -q
165+
brew update -q
196166
brew upgrade -f -q
197167
brew bundle install -q --no-lock
198168
brew cleanup -q -s
@@ -207,8 +177,8 @@ jobs:
207177
shell: zsh -efuo pipefail {0}
208178

209179
bzlmod_ubuntu:
210-
name: bzlmod ubuntu 22.04
211-
runs-on: ubuntu-22.04
180+
name: bzlmod ubuntu latest
181+
runs-on: ubuntu-latest
212182
container: ubuntu:latest
213183
steps:
214184
- name: setup
@@ -225,9 +195,9 @@ jobs:
225195
gnupg \
226196
python-is-python3 \
227197
wget
228-
wget -qO - https://bazel.build/bazel-release.pub.gpg 2>/dev/null | gpg --dearmor - \
229-
> /usr/share/keyrings/bazel-archive-keyring.gpg
230-
echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/bazel-archive-keyring.gpg] https://storage.googleapis.com/bazel-apt stable jdk1.8' \
198+
wget -qO - https://bazel.build/bazel-release.pub.gpg 2>/dev/null \
199+
| gpg --dearmor - > /usr/share/keyrings/bazel-archive-keyring.gpg
200+
echo 'deb [signed-by=/usr/share/keyrings/bazel-archive-keyring.gpg] https://storage.googleapis.com/bazel-apt stable jdk1.8' \
231201
> /etc/apt/sources.list.d/bazel.list
232202
apt-get -qq -o APT::Acquire::Retries=4 update \
233203
|| (sleep 15; apt-get -qq -o APT::Acquire::Retries=4 update)
@@ -246,9 +216,9 @@ jobs:
246216
shell: bash
247217

248218
cmake_alpine:
249-
name: cmake alpine 3
250-
runs-on: ubuntu-22.04
251-
container: alpine:3
219+
name: cmake alpine latest
220+
runs-on: ubuntu-latest
221+
container: alpine:latest
252222
steps:
253223
- name: setup
254224
run: |
@@ -289,7 +259,7 @@ jobs:
289259

290260
cmake_arch:
291261
name: cmake arch latest
292-
runs-on: ubuntu-22.04
262+
runs-on: ubuntu-latest
293263
container: archlinux:latest
294264
steps:
295265
- name: setup
@@ -333,7 +303,7 @@ jobs:
333303

334304
cmake_fedora:
335305
name: cmake fedora latest
336-
runs-on: ubuntu-22.04
306+
runs-on: ubuntu-latest
337307
container: fedora:latest
338308
steps:
339309
- name: setup
@@ -379,29 +349,14 @@ jobs:
379349
shell: bash
380350

381351
cmake_macos:
382-
name: cmake macos latest
383-
runs-on: macos-latest
352+
name: cmake macos 14
353+
runs-on: macos-14
384354
steps:
385355
- name: checkout
386356
uses: actions/checkout@v4
387357
- name: setup
388358
run: |
389-
rm -f \
390-
/usr/local/bin/2to3 \
391-
/usr/local/bin/2to3-3.* \
392-
/usr/local/bin/go \
393-
/usr/local/bin/gofmt \
394-
/usr/local/bin/idle3 \
395-
/usr/local/bin/idle3.* \
396-
/usr/local/bin/pydoc3 \
397-
/usr/local/bin/pydoc3.* \
398-
/usr/local/bin/python3 \
399-
/usr/local/bin/python3.* \
400-
/usr/local/bin/python3-config \
401-
/usr/local/bin/python3.*-config \
402-
/usr/local/lib/libtcl8.*.dylib \
403-
/usr/local/lib/libtk8.*.dylib
404-
brew update-reset -q
359+
brew update -q
405360
brew upgrade -f -q
406361
brew bundle install -q --no-lock
407362
brew cleanup -q -s
@@ -435,7 +390,7 @@ jobs:
435390

436391
cmake_rockylinux:
437392
name: cmake rockylinux 9
438-
runs-on: ubuntu-22.04
393+
runs-on: ubuntu-latest
439394
container: rockylinux:9
440395
steps:
441396
- name: setup
@@ -483,9 +438,9 @@ jobs:
483438
shell: bash
484439

485440
cmake_ubuntu:
486-
name: cmake ubuntu 22.04
487-
runs-on: ubuntu-22.04
488-
container: ubuntu:22.04
441+
name: cmake ubuntu latest
442+
runs-on: ubuntu-latest
443+
container: ubuntu:latest
489444
steps:
490445
- name: setup
491446
run: |
@@ -496,26 +451,15 @@ jobs:
496451
apt-get -qq -o APT::Acquire::Retries=4 -o Dpkg::Use-Pty=0 \
497452
--no-install-recommends install \
498453
ca-certificates \
454+
cmake \
499455
doxygen \
500-
dpkg \
501456
dpkg-dev \
502457
file \
503458
g++ \
504459
git \
505-
gnupg \
506460
graphviz \
507461
make \
508-
pkg-config \
509-
wget
510-
wget -qO- https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \
511-
| gpg --dearmor - > /usr/share/keyrings/kitware-archive-keyring.gpg
512-
echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' \
513-
> /etc/apt/sources.list.d/kitware.list
514-
apt-get -qq -o APT::Acquire::Retries=4 update \
515-
|| (sleep 15; apt-get -qq -o APT::Acquire::Retries=4 update)
516-
apt-get -qq -o APT::Acquire::Retries=4 -o Dpkg::Use-Pty=0 \
517-
--no-install-recommends install \
518-
cmake
462+
pkgconf
519463
apt-get -qq -o Dpkg::Use-Pty=0 autoremove
520464
rm -rf /var/lib/apt/lists/*
521465
env:

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ on: # yamllint disable-line rule:truthy
4747
jobs:
4848
analyze:
4949
name: analyze
50-
runs-on: ubuntu-22.04
50+
runs-on: ubuntu-latest
5151
steps:
5252
- name: checkout
5353
uses: actions/checkout@v4

‎AVO.pc.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ includedir=${prefix}/@AVO_INCLUDE_DIR@
3838

3939
Name: @AVO_NAME@
4040
Description: @PROJECT_DESCRIPTION@
41-
URL: @AVO_HOMEPAGE_URL@
41+
URL: @PROJECT_HOMEPAGE_URL@
4242
Version: @PROJECT_VERSION@
4343
Libs: -L${libdir} -l@AVO_LIBRARY@
4444
Cflags: -I${includedir}

‎CMakeLists.txt‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,12 @@
3434
# <https://gamma.cs.unc.edu/AVO/>
3535
#
3636

37-
cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
37+
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
3838
project(AVO
3939
VERSION 1.0.1
4040
DESCRIPTION
4141
"Reciprocal Collision Avoidance with Acceleration-Velocity Obstacles"
42+
HOMEPAGE_URL https://gamma.cs.unc.edu/AVO/
4243
LANGUAGES CXX)
4344

4445
list(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_SOURCE_DIR}/cmake/modules")
@@ -68,7 +69,6 @@ set(AVO_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR})
6869
set(AVO_LIBRARY AVO)
6970

7071
set(AVO_NAME "AVO2 Library")
71-
set(AVO_HOMEPAGE_URL https://gamma.cs.unc.edu/AVO/)
7272

7373
set(CMAKE_CXX_STANDARD 98)
7474
set(CMAKE_CXX_STANDARD_REQUIRED OFF)
@@ -259,7 +259,8 @@ if(NOT MSVC)
259259
endif()
260260
endif()
261261

262-
option(WARNINGS_AS_ERRORS "Turn compiler warnings into errors" OFF)
262+
option(WARNINGS_AS_ERRORS
263+
"Turn compiler warnings into errors if supported" OFF)
263264

264265
if(WARNINGS_AS_ERRORS)
265266
if(MSVC)
@@ -329,18 +330,18 @@ set(CPACK_SOURCE_STRIP_FILES ON)
329330

330331
set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
331332
set(CPACK_DEBIAN_PACKAGE_DEPENDS)
332-
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${AVO_HOMEPAGE_URL})
333+
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${PROJECT_HOMEPAGE_URL})
333334
set(CPACK_DEBIAN_PACKAGE_SECTION contrib/devel)
334335
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
335336

336337
set(CPACK_FREEBSD_PACKAGE_DEPS)
337338
set(CPACK_FREEBSD_PACKAGE_LICENSE APACHE20)
338-
set(CPACK_FREEBSD_PACKAGE_WWW ${AVO_HOMEPAGE_URL})
339+
set(CPACK_FREEBSD_PACKAGE_WWW ${PROJECT_HOMEPAGE_URL})
339340

340341
set(CPACK_RPM_FILE_NAME RPM-DEFAULT)
341342
set(CPACK_RPM_PACKAGE_AUTOREQPROV ON)
342343
set(CPACK_RPM_PACKAGE_LICENSE "ASL 2.0")
343344
set(CPACK_RPM_PACKAGE_REQUIRES)
344-
set(CPACK_RPM_PACKAGE_URL ${AVO_HOMEPAGE_URL})
345+
set(CPACK_RPM_PACKAGE_URL ${PROJECT_HOMEPAGE_URL})
345346

346347
include(CPack)

0 commit comments

Comments
 (0)