Skip to content

Commit

Permalink
* Add run-clang-format.py script to build-env-base image
Browse files Browse the repository at this point in the history
* Refactor `everest-clang-format` image to use `build-env-base` as base image
* Update github action `run-glang-format` to use new `everest-clang-format` image

Signed-off-by: Andreas Heinrich <andreas.heinrich@rwth-aachen.de>
  • Loading branch information
andistorm committed Jul 16, 2024
1 parent b42e569 commit 99e750f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 14 deletions.
2 changes: 2 additions & 0 deletions docker/images/build-env-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ RUN apt update \
RUN ln -s /usr/bin/clang-format-15 /usr/bin/clang-format \
&& ln -s /usr/bin/clang-tidy-15 /usr/bin/clang-tidy

COPY run-clang-format.py /usr/bin/run-clang-format

# additional packages
RUN apt update \
&& apt install --no-install-recommends -y \
Expand Down
File renamed without changes.
15 changes: 2 additions & 13 deletions docker/images/everest-clang-format/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,4 @@
ARG BASE_IMAGE=debian:12
FROM ${BASE_IMAGE}

RUN apt update && apt upgrade -y
RUN apt update && \
apt install -y \
clang-format-15=1:15.0.6*
RUN ln -s /usr/bin/clang-format-15 /usr/bin/clang-format

RUN apt install -y \
python-is-python3

COPY run-clang-format.py /usr/bin/run-clang-format
ARG BASE_IMAGE_TAG=latest
FROM ghcr.io/everest/everest-ci/build-env-base:${BASE_IMAGE_TAG}

ENTRYPOINT ["/usr/bin/run-clang-format"]
2 changes: 1 addition & 1 deletion github-actions/run-clang-format/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ inputs:
default: 'always'
runs:
using: 'docker'
image: 'docker://ghcr.io/everest/everest-clang-format:v1.1.0'
image: 'docker://ghcr.io/everest/everest-ci/everest-clang-format:refactor-docker-images' # LTODO: Update this
args:
- /github/workspace/${{ inputs.source-dir }}
- --extensions
Expand Down

0 comments on commit 99e750f

Please sign in to comment.