Skip to content

Commit a36799d

Browse files
committed
Try making patch ignore spaces
1 parent 9ac905d commit a36799d

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -240,21 +240,21 @@ jobs:
240240
# install APPLgrid
241241
curl -L "https://applgrid.hepforge.org/downloads?f=applgrid-${APPLGRID_V}.tgz" | tar xzf -
242242
cd applgrid-${APPLGRID_V}
243-
patch -p0 <<EOF
243+
patch -l -p0 <<EOF
244244
--- src/combine.cxx 2024-04-23 16:35:27.000000000 +0200
245245
+++ src/combine.cxx.new 2024-07-06 12:29:12.813303074 +0200
246246
@@ -56,12 +56,6 @@
247-
}
248-
249-
250-
-double integral( appl::TH1D* h ) {
247+
}
248+
249+
250+
-double integral( appl::TH1D* h ) {
251251
- double d = 0;
252252
- for ( int i=0 ; i<h->GetNbinsX() ; i++ ) d += h->GetBinContent(i+1);
253253
- return d;
254254
-}
255255
-
256-
257-
void print( appl::TH1D* h ) {
256+
257+
void print( appl::TH1D* h ) {
258258
for ( int i=1 ; i<=h->GetNbinsX() ; i++ ) std::cout << h->GetBinContent(i) << " ";
259259
EOF
260260
# compile static libraries with PIC to make statically linking PineAPPL's CLI work

.pre-commit-config.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ repos:
66
hooks:
77
- id: trailing-whitespace
88
# `.rs` files are taken care of by `cargo fmt`
9-
# `.github/workflows/release.yml` contains vital spaces
10-
exclude: ^(.*\.rs|\.github/workflows/release.yml)$
9+
exclude: ^.*\.rs$
1110
- id: end-of-file-fixer
1211
- id: check-merge-conflict
1312
- repo: https://github.com/astral-sh/ruff-pre-commit

0 commit comments

Comments
 (0)