Bump clang-format version to 10-13

Author: pgrete

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "cpp-py-format"
-version = "0.2.3"
-authors = ["Andrew Gaspar <[email protected]>","Joshua Brown <[email protected]>"]
-edition = "2018"
+version = "0.3.0"
+authors = ["Andrew Gaspar <[email protected]>","Joshua Brown <[email protected]>", "Philipp Grete <[email protected]"]
+edition = "2022"
 
 [dependencies]
 glob = "0.3.0"

Dockerfile

@@ -7,16 +7,16 @@ COPY src ./src
 RUN cargo install --path .
 
 # GitHub Action Image
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 # Install our apt packages
 RUN apt-get update
 RUN apt-get upgrade -y
-RUN apt-get install -y git
-RUN apt-get install -y python3-pip
+RUN apt-get install -y git \
+  python3-pip \
+  clang-format-10 clang-format-11 clang-format-12 clang-format-13 \
+  && rm -rf /var/lib/apt/lists/*
 RUN python3 -m pip install --upgrade pip
 RUN python3 -m pip install black
 
-# Install clang-formats
-ADD ./clang-format /clang-format
 COPY --from=builder /usr/local/cargo/bin/cpp-py-format /cpp-py-format
 ENTRYPOINT [ "/cpp-py-format" ]

check/action.yml

@@ -9,9 +9,9 @@ inputs:
     required: true
   clangFormatVersion:
     description:
-      Major Clang Version number. Supports clang 5 to 10. Default 10
+      Major Clang Version number. Supports clang 10 to 13. Default 13
     required: false
-    default: '10'
+    default: '13'
   include_c:
     description:
       Comma-separated list of file globs (e.g '**/*.cpp,**/*.hpp') that

clang-format/clang-format-10

@@ -9,9 +9,9 @@ inputs:
     required: true
   clangFormatVersion:
     description:
-      Major Clang Version number. Supports clang 5 to 10. Default 10
+      Major Clang Version number. Supports clang 10 to 13. Default 13
     required: false
-    default: '10'
+    default: '13'
   include_c:
     description:
       Comma-separated list of file globs (e.g '**/*.cpp,**/*.hpp') that

clang-format/clang-format-5

@@ -41,7 +41,7 @@ struct App {
 impl App {
     fn run() -> Result<(), Box<dyn Error>> {
         let matches = clap::App::new("cpp-py-format")
-            .author("Andrew Gaspar <[email protected]>, Joshua Brown <[email protected]")
+            .author("Andrew Gaspar <[email protected]>, Joshua Brown <[email protected], Philipp Grete <[email protected]>")
             .about("Runner code for executing clang-format, and black")
             .arg(
                 Arg::with_name("github-token")
@@ -53,7 +53,7 @@ impl App {
                 Arg::with_name("clang-format-version")
                     .long("clang-format-version")
                     .takes_value(true)
-                    .default_value("10")
+                    .default_value("13")
                     .conflicts_with("clang-format-override"),
             )
             .arg(
@@ -106,7 +106,7 @@ impl App {
             if let Some(clang_format_override) = matches.value_of("clang-format-override") {
                 clang_format_override.into()
             } else if env::var("GITHUB_ACTION").is_ok() {
-                format!("/clang-format/clang-format-{}", clang_format_version).into()
+                format!("/usr/bin/clang-format-{}", clang_format_version).into()
             } else {
                 String::from_utf8(
                     Command::new("which")