Skip to content

Commit b369f42

Browse files
fenollpfenollp
committed
patchy patch
Signed-off-by: Pierre Fenoll <[email protected]>
1 parent d793f3b commit b369f42

File tree

6 files changed

+85
-76
lines changed

6 files changed

+85
-76
lines changed

‎.github/workflows/clis.yml

Lines changed: 28 additions & 28 deletions
Large diffs are not rendered by default.

‎.github/workflows/self.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ jobs:
150150
cross*|ntpd*) exit 0 ;; # TODO: fix undeterministic final paths for git crates
151151
*) ;;
152152
esac
153-
git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- $CARGOGREEN_FINAL_PATH
153+
git --no-pager diff --exit-code --ignore-matching-lines='^# Generated by' --ignore-matching-lines=' AS rust-base$' --ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' --ignore-matching-lines="^## '\{" -- $CARGOGREEN_FINAL_PATH
154154
- run: sudo du -sh /var/lib/docker
155155
- run: docker system df
156156
- run: docker system df --verbose
@@ -262,7 +262,7 @@ jobs:
262262
cross*|ntpd*) exit 0 ;; # TODO: fix undeterministic final paths for git crates
263263
*) ;;
264264
esac
265-
git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- $CARGOGREEN_FINAL_PATH
265+
git --no-pager diff --exit-code --ignore-matching-lines='^# Generated by' --ignore-matching-lines=' AS rust-base$' --ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' --ignore-matching-lines="^## '\{" -- $CARGOGREEN_FINAL_PATH
266266
- run: sudo du -sh /var/lib/docker
267267
- run: docker system df
268268
- run: docker system df --verbose
@@ -374,7 +374,7 @@ jobs:
374374
cross*|ntpd*) exit 0 ;; # TODO: fix undeterministic final paths for git crates
375375
*) ;;
376376
esac
377-
git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- $CARGOGREEN_FINAL_PATH
377+
git --no-pager diff --exit-code --ignore-matching-lines='^# Generated by' --ignore-matching-lines=' AS rust-base$' --ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' --ignore-matching-lines="^## '\{" -- $CARGOGREEN_FINAL_PATH
378378
- run: sudo du -sh /var/lib/docker
379379
- run: docker system df
380380
- run: docker system df --verbose
@@ -425,7 +425,7 @@ jobs:
425425
cross*|ntpd*) exit 0 ;; # TODO: fix undeterministic final paths for git crates
426426
*) ;;
427427
esac
428-
git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- $CARGOGREEN_FINAL_PATH
428+
git --no-pager diff --exit-code --ignore-matching-lines='^# Generated by' --ignore-matching-lines=' AS rust-base$' --ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' --ignore-matching-lines="^## '\{" -- $CARGOGREEN_FINAL_PATH
429429
- run: sudo du -sh /var/lib/docker
430430
- run: docker system df
431431
- run: docker system df --verbose
@@ -534,7 +534,7 @@ jobs:
534534
cross*|ntpd*) exit 0 ;; # TODO: fix undeterministic final paths for git crates
535535
*) ;;
536536
esac
537-
git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- $CARGOGREEN_FINAL_PATH
537+
git --no-pager diff --exit-code --ignore-matching-lines='^# Generated by' --ignore-matching-lines=' AS rust-base$' --ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' --ignore-matching-lines="^## '\{" -- $CARGOGREEN_FINAL_PATH
538538
- name: cargo build net=OFF cache=OFF remote=OFF jobs=1
539539
run: |
540540
unset CARGO_INCREMENTAL
@@ -579,7 +579,7 @@ jobs:
579579
cross*|ntpd*) exit 0 ;; # TODO: fix undeterministic final paths for git crates
580580
*) ;;
581581
esac
582-
git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- $CARGOGREEN_FINAL_PATH
582+
git --no-pager diff --exit-code --ignore-matching-lines='^# Generated by' --ignore-matching-lines=' AS rust-base$' --ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' --ignore-matching-lines="^## '\{" -- $CARGOGREEN_FINAL_PATH
583583
- run: sudo du -sh /var/lib/docker
584584
- run: docker system df
585585
- run: docker system df --verbose
@@ -637,7 +637,7 @@ jobs:
637637
cross*|ntpd*) exit 0 ;; # TODO: fix undeterministic final paths for git crates
638638
*) ;;
639639
esac
640-
git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- $CARGOGREEN_FINAL_PATH
640+
git --no-pager diff --exit-code --ignore-matching-lines='^# Generated by' --ignore-matching-lines=' AS rust-base$' --ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' --ignore-matching-lines="^## '\{" -- $CARGOGREEN_FINAL_PATH
641641
- run: sudo du -sh /var/lib/docker
642642
- run: docker system df
643643
- run: docker system df --verbose
@@ -695,7 +695,7 @@ jobs:
695695
cross*|ntpd*) exit 0 ;; # TODO: fix undeterministic final paths for git crates
696696
*) ;;
697697
esac
698-
git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- $CARGOGREEN_FINAL_PATH
698+
git --no-pager diff --exit-code --ignore-matching-lines='^# Generated by' --ignore-matching-lines=' AS rust-base$' --ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' --ignore-matching-lines="^## '\{" -- $CARGOGREEN_FINAL_PATH
699699
- run: sudo du -sh /var/lib/docker
700700
- run: docker system df
701701
- run: docker system df --verbose
@@ -804,7 +804,7 @@ jobs:
804804
cross*|ntpd*) exit 0 ;; # TODO: fix undeterministic final paths for git crates
805805
*) ;;
806806
esac
807-
git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- $CARGOGREEN_FINAL_PATH
807+
git --no-pager diff --exit-code --ignore-matching-lines='^# Generated by' --ignore-matching-lines=' AS rust-base$' --ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' --ignore-matching-lines="^## '\{" -- $CARGOGREEN_FINAL_PATH
808808
- name: cargo test net=OFF cache=OFF remote=OFF jobs=1
809809
run: |
810810
unset CARGO_INCREMENTAL
@@ -849,7 +849,7 @@ jobs:
849849
cross*|ntpd*) exit 0 ;; # TODO: fix undeterministic final paths for git crates
850850
*) ;;
851851
esac
852-
git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- $CARGOGREEN_FINAL_PATH
852+
git --no-pager diff --exit-code --ignore-matching-lines='^# Generated by' --ignore-matching-lines=' AS rust-base$' --ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' --ignore-matching-lines="^## '\{" -- $CARGOGREEN_FINAL_PATH
853853
- run: sudo du -sh /var/lib/docker
854854
- run: docker system df
855855
- run: docker system df --verbose
@@ -907,7 +907,7 @@ jobs:
907907
cross*|ntpd*) exit 0 ;; # TODO: fix undeterministic final paths for git crates
908908
*) ;;
909909
esac
910-
git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- $CARGOGREEN_FINAL_PATH
910+
git --no-pager diff --exit-code --ignore-matching-lines='^# Generated by' --ignore-matching-lines=' AS rust-base$' --ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' --ignore-matching-lines="^## '\{" -- $CARGOGREEN_FINAL_PATH
911911
- run: sudo du -sh /var/lib/docker
912912
- run: docker system df
913913
- run: docker system df --verbose
@@ -965,7 +965,7 @@ jobs:
965965
cross*|ntpd*) exit 0 ;; # TODO: fix undeterministic final paths for git crates
966966
*) ;;
967967
esac
968-
git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- $CARGOGREEN_FINAL_PATH
968+
git --no-pager diff --exit-code --ignore-matching-lines='^# Generated by' --ignore-matching-lines=' AS rust-base$' --ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' --ignore-matching-lines="^## '\{" -- $CARGOGREEN_FINAL_PATH
969969
- run: sudo du -sh /var/lib/docker
970970
- run: docker system df
971971
- run: docker system df --verbose
@@ -1074,7 +1074,7 @@ jobs:
10741074
cross*|ntpd*) exit 0 ;; # TODO: fix undeterministic final paths for git crates
10751075
*) ;;
10761076
esac
1077-
git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- $CARGOGREEN_FINAL_PATH
1077+
git --no-pager diff --exit-code --ignore-matching-lines='^# Generated by' --ignore-matching-lines=' AS rust-base$' --ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' --ignore-matching-lines="^## '\{" -- $CARGOGREEN_FINAL_PATH
10781078
- name: cargo check net=OFF cache=OFF remote=OFF jobs=$(nproc)
10791079
run: |
10801080
unset CARGO_INCREMENTAL
@@ -1119,7 +1119,7 @@ jobs:
11191119
cross*|ntpd*) exit 0 ;; # TODO: fix undeterministic final paths for git crates
11201120
*) ;;
11211121
esac
1122-
git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- $CARGOGREEN_FINAL_PATH
1122+
git --no-pager diff --exit-code --ignore-matching-lines='^# Generated by' --ignore-matching-lines=' AS rust-base$' --ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' --ignore-matching-lines="^## '\{" -- $CARGOGREEN_FINAL_PATH
11231123
- run: sudo du -sh /var/lib/docker
11241124
- run: docker system df
11251125
- run: docker system df --verbose
@@ -1177,7 +1177,7 @@ jobs:
11771177
cross*|ntpd*) exit 0 ;; # TODO: fix undeterministic final paths for git crates
11781178
*) ;;
11791179
esac
1180-
git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- $CARGOGREEN_FINAL_PATH
1180+
git --no-pager diff --exit-code --ignore-matching-lines='^# Generated by' --ignore-matching-lines=' AS rust-base$' --ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' --ignore-matching-lines="^## '\{" -- $CARGOGREEN_FINAL_PATH
11811181
- run: sudo du -sh /var/lib/docker
11821182
- run: docker system df
11831183
- run: docker system df --verbose
@@ -1286,7 +1286,7 @@ jobs:
12861286
cross*|ntpd*) exit 0 ;; # TODO: fix undeterministic final paths for git crates
12871287
*) ;;
12881288
esac
1289-
git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- $CARGOGREEN_FINAL_PATH
1289+
git --no-pager diff --exit-code --ignore-matching-lines='^# Generated by' --ignore-matching-lines=' AS rust-base$' --ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' --ignore-matching-lines="^## '\{" -- $CARGOGREEN_FINAL_PATH
12901290
- name: cargo package net=OFF cache=OFF remote=OFF jobs=1
12911291
run: |
12921292
unset CARGO_INCREMENTAL
@@ -1331,7 +1331,7 @@ jobs:
13311331
cross*|ntpd*) exit 0 ;; # TODO: fix undeterministic final paths for git crates
13321332
*) ;;
13331333
esac
1334-
git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- $CARGOGREEN_FINAL_PATH
1334+
git --no-pager diff --exit-code --ignore-matching-lines='^# Generated by' --ignore-matching-lines=' AS rust-base$' --ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' --ignore-matching-lines="^## '\{" -- $CARGOGREEN_FINAL_PATH
13351335
- run: sudo du -sh /var/lib/docker
13361336
- run: docker system df
13371337
- run: docker system df --verbose
@@ -1441,7 +1441,7 @@ jobs:
14411441
cross*|ntpd*) exit 0 ;; # TODO: fix undeterministic final paths for git crates
14421442
*) ;;
14431443
esac
1444-
git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- $CARGOGREEN_FINAL_PATH
1444+
git --no-pager diff --exit-code --ignore-matching-lines='^# Generated by' --ignore-matching-lines=' AS rust-base$' --ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' --ignore-matching-lines="^## '\{" -- $CARGOGREEN_FINAL_PATH
14451445
- name: cargo clippy net=OFF cache=OFF remote=OFF jobs=1
14461446
run: |
14471447
unset CARGO_INCREMENTAL
@@ -1486,7 +1486,7 @@ jobs:
14861486
cross*|ntpd*) exit 0 ;; # TODO: fix undeterministic final paths for git crates
14871487
*) ;;
14881488
esac
1489-
git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- $CARGOGREEN_FINAL_PATH
1489+
git --no-pager diff --exit-code --ignore-matching-lines='^# Generated by' --ignore-matching-lines=' AS rust-base$' --ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' --ignore-matching-lines="^## '\{" -- $CARGOGREEN_FINAL_PATH
14901490
- run: sudo du -sh /var/lib/docker
14911491
- run: docker system df
14921492
- run: docker system df --verbose
@@ -1544,7 +1544,7 @@ jobs:
15441544
cross*|ntpd*) exit 0 ;; # TODO: fix undeterministic final paths for git crates
15451545
*) ;;
15461546
esac
1547-
git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- $CARGOGREEN_FINAL_PATH
1547+
git --no-pager diff --exit-code --ignore-matching-lines='^# Generated by' --ignore-matching-lines=' AS rust-base$' --ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' --ignore-matching-lines="^## '\{" -- $CARGOGREEN_FINAL_PATH
15481548
- run: sudo du -sh /var/lib/docker
15491549
- run: docker system df
15501550
- run: docker system df --verbose

‎hack/ck.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,12 @@ cat <<EOF
114114
cross*|ntpd*) exit 0 ;; # TODO: fix undeterministic final paths for git crates
115115
*) ;;
116116
esac
117-
git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- \$CARGOGREEN_FINAL_PATH
117+
git --no-pager diff --exit-code \
118+
--ignore-matching-lines='^# Generated by' \
119+
--ignore-matching-lines=' AS rust-base$' \
120+
--ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' \
121+
--ignore-matching-lines="^## '\\{" \
122+
-- \$CARGOGREEN_FINAL_PATH
118123
EOF
119124
}
120125

‎hack/recipes.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,17 @@ for f in *.Dockerfile/*.Dockerfile; do
1111
rmdir $(dirname $f)
1212
f=recipes/$(basename $f)
1313

14-
if git --no-pager diff --exit-code -I '^# Generated by' -I ' AS rust-base$' -I '^# syntax=docker.io/docker/dockerfile:1@' -- $f; then
14+
# When diffing, ignore changes that:
15+
# mention the crate version number
16+
# mention the rustc version number
17+
# mention BuildKit syntax version
18+
# and changes to cargo JSON stderr messages. (TODO: drop) Turns out these are flaky though multiple builds...
19+
if git --no-pager diff --exit-code \
20+
--ignore-matching-lines='^# Generated by' \
21+
--ignore-matching-lines=' AS rust-base$' \
22+
--ignore-matching-lines='^# syntax=docker.io/docker/dockerfile:1@' \
23+
--ignore-matching-lines="^## '\{" \
24+
-- $f; then
1525
git checkout -- $f
1626
fi
1727
done

0 commit comments

Comments
 (0)