Try making patch ignore spaces

NNPDF · Oct 24, 2024 · a36799d · a36799d
1 parent 9ac905d
commit a36799d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -240,21 +240,21 @@ jobs:
             # install APPLgrid
             curl -L "https://applgrid.hepforge.org/downloads?f=applgrid-${APPLGRID_V}.tgz" | tar xzf -
             cd applgrid-${APPLGRID_V}
-            patch -p0 <<EOF
+            patch -l -p0 <<EOF
             --- src/combine.cxx	2024-04-23 16:35:27.000000000 +0200
             +++ src/combine.cxx.new	2024-07-06 12:29:12.813303074 +0200
             @@ -56,12 +56,6 @@
-             } 
-             
-             
-            -double integral( appl::TH1D* h ) { 
+             }
+
+
+            -double integral( appl::TH1D* h ) {
             -  double d = 0;
             -  for ( int i=0 ; i<h->GetNbinsX() ; i++ ) d += h->GetBinContent(i+1);
             -  return d;
             -}
             -
-             
-             void print( appl::TH1D* h ) { 
+
+             void print( appl::TH1D* h ) {
                for ( int i=1 ; i<=h->GetNbinsX() ; i++ ) std::cout << h->GetBinContent(i) << " ";
             EOF
             # compile static libraries with PIC to make statically linking PineAPPL's CLI work

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,8 +6,7 @@ repos:
     hooks:
       - id: trailing-whitespace
         # `.rs` files are taken care of by `cargo fmt`
-        # `.github/workflows/release.yml` contains vital spaces
-        exclude: ^(.*\.rs|\.github/workflows/release.yml)$
+        exclude: ^.*\.rs$
       - id: end-of-file-fixer
       - id: check-merge-conflict
   - repo: https://github.com/astral-sh/ruff-pre-commit