From ec0cae3b49c172493a562eb79c76fac4875a7ba0 Mon Sep 17 00:00:00 2001 From: "Kevin R. Thornton" Date: Thu, 17 Aug 2023 12:00:48 -0700 Subject: [PATCH] Buid and packaging changes: * Add cmake to pyproject.toml * Rely on cmake via pyproject.toml for building Docker image. * Restore docker building CI to pulls for dev Fixes #1176 --- .github/workflows/docker_deployment.yml | 1 + deployment/docker/Dockerfile | 2 +- pyproject.toml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker_deployment.yml b/.github/workflows/docker_deployment.yml index f95663e6a..3f8b3494c 100644 --- a/.github/workflows/docker_deployment.yml +++ b/.github/workflows/docker_deployment.yml @@ -9,6 +9,7 @@ on: pull_request: branches: - 'main' + - 'dev' jobs: docker: diff --git a/deployment/docker/Dockerfile b/deployment/docker/Dockerfile index 0bebd208b..2e669a18c 100644 --- a/deployment/docker/Dockerfile +++ b/deployment/docker/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /app COPY . /app -RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -qq -y install cmake \ +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -qq -y install \ gcc \ git \ g++ \ diff --git a/pyproject.toml b/pyproject.toml index eed7dc28b..3f0970277 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,6 +5,7 @@ requires = [ "wheel", "setuptools_scm", "pybind11[global]==2.11.1", + "cmake>=3.27.2" ] build-backend = "setuptools.build_meta"