diff --git a/.ci/build/apt.py b/.ci/build/apt.py index aa180da..435d94b 100644 --- a/.ci/build/apt.py +++ b/.ci/build/apt.py @@ -10,6 +10,6 @@ "build-essential", "cmake", "ninja-build", "pkg-config", "python3", "libboost-dev", "libboost-date-time-dev", "libboost-exception-dev", "libboost-log-dev", "libboost-filesystem-dev", "libboost-regex-dev", - "libdcmtk-dev", "libicu-dev", "libjsoncpp-dev", "zlib1g-dev", + "libdcmtk-dev", "libicu-dev", "libjsoncpp-dev", "libnsl-dev", "zlib1g-dev", "pybind11-dev", "python3-pybind11", "python3-dev", "libboost-test-dev", "dcmtk"]) diff --git a/.ci/build/post_build.py b/.ci/build/post_build.py index 76b7707..748ba29 100644 --- a/.ci/build/post_build.py +++ b/.ci/build/post_build.py @@ -66,6 +66,5 @@ def prepend_env_path(item, paths): os.remove(os.path.join(workspace, "tests", "data", "index.dat")) for path in glob.glob(os.path.join(workspace, "tests", "data", "RAW_*.dcm")): os.remove(path) -os.remove(os.path.join(workspace, "tests", "data", "dcmqrscp.config")) sys.exit(return_code) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c302dac..7b9a6ef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,8 +12,8 @@ jobs: include: - { os: "ubuntu-latest", container: "debian:bullseye", packaging: "apt", python: "python3" } - { os: "ubuntu-latest", container: "debian:bookworm", packaging: "apt", cmake_options: "-DCMAKE_CXX_STANDARD=17", python: "python3" } - - { os: "ubuntu-latest", container: "ubuntu:focal", packaging: "apt", python: "python3" } - { os: "ubuntu-latest", container: "ubuntu:jammy", packaging: "apt", cmake_options: "-DCMAKE_CXX_STANDARD=17", python: "python3" } + - { os: "ubuntu-latest", container: "ubuntu:noble", packaging: "apt", cmake_options: "-DCMAKE_CXX_STANDARD=17", python: "python3" } - { os: "ubuntu-latest", packaging: "conda", cmake_options: "-DCMAKE_CXX_STANDARD=17", python: "python" } # NOTE: macos-latest may run macOS on M1 CPUs for which DCMTK is not compiled. - { os: "macos-13", packaging: "conda", cmake_options: "-DCMAKE_CXX_STANDARD=17", python: "python" }