Skip to content

Commit 602c4ca

Browse files
authored
[upstream_utils] Check patch files are up to date (#7401)
1 parent 661c321 commit 602c4ca

File tree

41 files changed

+73
-53
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+73
-53
lines changed

.github/workflows/upstream-utils.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,101 +35,121 @@ jobs:
3535
cd upstream_utils
3636
./apriltag.py clone
3737
./apriltag.py copy-src
38+
./apriltag.py format-patch
3839
- name: Run argparse_lib.py
3940
run: |
4041
cd upstream_utils
4142
./argparse_lib.py clone
4243
./argparse_lib.py copy-src
44+
./argparse_lib.py format-patch
4345
- name: Run eigen.py
4446
run: |
4547
cd upstream_utils
4648
./eigen.py clone
4749
./eigen.py copy-src
50+
./eigen.py format-patch
4851
- name: Run expected.py
4952
run: |
5053
cd upstream_utils
5154
./expected.py clone
5255
./expected.py copy-src
56+
./expected.py format-patch
5357
- name: Run fmt.py
5458
run: |
5559
cd upstream_utils
5660
./fmt.py clone
5761
./fmt.py copy-src
62+
./fmt.py format-patch
5863
- name: Run gcem.py
5964
run: |
6065
cd upstream_utils
6166
./gcem.py clone
6267
./gcem.py copy-src
68+
./gcem.py format-patch
6369
- name: Run gl3w.py
6470
run: |
6571
cd upstream_utils
6672
./gl3w.py clone
6773
./gl3w.py copy-src
74+
./gl3w.py format-patch
6875
- name: Run glfw.py
6976
run: |
7077
cd upstream_utils
7178
./glfw.py clone
7279
./glfw.py copy-src
80+
./glfw.py format-patch
7381
- name: Run googletest.py
7482
run: |
7583
cd upstream_utils
7684
./googletest.py clone
7785
./googletest.py copy-src
86+
./googletest.py format-patch
7887
- name: Run imgui.py
7988
run: |
8089
cd upstream_utils
8190
./imgui.py clone
8291
./imgui.py copy-src
92+
./imgui.py format-patch
8393
- name: Run implot.py
8494
run: |
8595
cd upstream_utils
8696
./implot.py clone
8797
./implot.py copy-src
98+
./implot.py format-patch
8899
- name: Run json.py
89100
run: |
90101
cd upstream_utils
91102
./json.py clone
92103
./json.py copy-src
104+
./json.py format-patch
93105
- name: Run libuv.py
94106
run: |
95107
cd upstream_utils
96108
./libuv.py clone
97109
./libuv.py copy-src
110+
./libuv.py format-patch
98111
- name: Run llvm.py
99112
run: |
100113
cd upstream_utils
101114
./llvm.py clone
102115
./llvm.py copy-src
116+
./llvm.py format-patch
103117
- name: Run mpack.py
104118
run: |
105119
cd upstream_utils
106120
./mpack.py clone
107121
./mpack.py copy-src
122+
./mpack.py format-patch
108123
- name: Run stack_walker.py
109124
run: |
110125
cd upstream_utils
111126
./stack_walker.py clone
112127
./stack_walker.py copy-src
128+
./stack_walker.py format-patch
113129
- name: Run memory.py
114130
run: |
115131
cd upstream_utils
116132
./memory.py clone
117133
./memory.py copy-src
134+
./memory.py format-patch
118135
- name: Run protobuf.py
119136
run: |
120137
cd upstream_utils
121138
./protobuf.py clone
122139
./protobuf.py copy-src
140+
./protobuf.py format-patch
123141
- name: Run sleipnir.py
124142
run: |
125143
cd upstream_utils
126144
./sleipnir.py clone
127145
./sleipnir.py copy-src
146+
./sleipnir.py format-patch
128147
- name: Run stb.py
129148
run: |
130149
cd upstream_utils
131150
./stb.py clone
132151
./stb.py copy-src
152+
./stb.py format-patch
133153
- name: Add untracked files to index so they count as changes
134154
run: git add -A
135155
- name: Check output

upstream_utils/argparse_lib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def copy_upstream_src(wpilib_root):
2626

2727

2828
def main():
29-
name = "argparse"
29+
name = "argparse_lib"
3030
url = "https://github.com/p-ranav/argparse"
3131
# master on 2024-09-11
3232
tag = "fd13c2859131ab463e617a5a8abcc69eb7e1d897"

upstream_utils/llvm_patches/0001-Remove-StringRef-ArrayRef-and-Optional.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: PJ Reiniger <[email protected]>
33
Date: Sat, 7 May 2022 22:09:18 -0400
4-
Subject: [PATCH 01/38] Remove StringRef, ArrayRef, and Optional
4+
Subject: [PATCH 01/36] Remove StringRef, ArrayRef, and Optional
55

66
---
77
llvm/include/llvm/ADT/PointerUnion.h | 1 -
@@ -30,7 +30,7 @@ Subject: [PATCH 01/38] Remove StringRef, ArrayRef, and Optional
3030
llvm/unittests/ADT/SmallVectorTest.cpp | 30 +----
3131
llvm/unittests/Support/ConvertUTFTest.cpp | 41 ++++---
3232
llvm/unittests/Support/xxhashTest.cpp | 4 +-
33-
30 files changed, 282 insertions(+), 323 deletions(-)
33+
26 files changed, 232 insertions(+), 271 deletions(-)
3434

3535
diff --git a/llvm/include/llvm/ADT/PointerUnion.h b/llvm/include/llvm/ADT/PointerUnion.h
3636
index 7d4ed02b622626bb8043acb57b8ce7ed97a5f949..8ac68dbc0a791b8ac0e0ca865e69024cb642aa70 100644

upstream_utils/llvm_patches/0002-Wrap-std-min-max-calls-in-parens-for-Windows-warning.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: PJ Reiniger <[email protected]>
33
Date: Sat, 7 May 2022 22:12:41 -0400
4-
Subject: [PATCH 02/38] Wrap std::min/max calls in parens, for Windows warnings
4+
Subject: [PATCH 02/36] Wrap std::min/max calls in parens, for Windows warnings
55

66
---
77
llvm/include/llvm/ADT/DenseMap.h | 4 ++--

upstream_utils/llvm_patches/0003-Change-unique_function-storage-size.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: PJ Reiniger <[email protected]>
33
Date: Sat, 7 May 2022 22:13:55 -0400
4-
Subject: [PATCH 03/38] Change unique_function storage size
4+
Subject: [PATCH 03/36] Change unique_function storage size
55

66
---
77
llvm/include/llvm/ADT/FunctionExtras.h | 4 ++--

upstream_utils/llvm_patches/0004-Threading-updates.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: PJ Reiniger <[email protected]>
33
Date: Sat, 7 May 2022 22:17:19 -0400
4-
Subject: [PATCH 04/38] Threading updates
4+
Subject: [PATCH 04/36] Threading updates
55

66
- Remove guards for threads and exception
77
- Prefer scope gaurd over lock gaurd

upstream_utils/llvm_patches/0005-ifdef-guard-safety.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: PJ Reiniger <[email protected]>
33
Date: Sat, 7 May 2022 22:28:13 -0400
4-
Subject: [PATCH 05/38] \#ifdef guard safety
4+
Subject: [PATCH 05/36] \#ifdef guard safety
55

66
Prevents redefinition if someone is pulling in real LLVM, since the macros are in global namespace
77
---

upstream_utils/llvm_patches/0006-Explicitly-use-std.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: PJ Reiniger <[email protected]>
33
Date: Sat, 7 May 2022 22:37:34 -0400
4-
Subject: [PATCH 06/38] Explicitly use std::
4+
Subject: [PATCH 06/36] Explicitly use std::
55

66
---
77
llvm/include/llvm/ADT/SmallSet.h | 2 +-
88
llvm/lib/Support/ErrorHandling.cpp | 2 +-
99
llvm/unittests/ADT/SmallPtrSetTest.cpp | 2 +-
1010
llvm/unittests/ADT/SmallSetTest.cpp | 10 +++++-----
11-
5 files changed, 9 insertions(+), 9 deletions(-)
11+
4 files changed, 8 insertions(+), 8 deletions(-)
1212

1313
diff --git a/llvm/include/llvm/ADT/SmallSet.h b/llvm/include/llvm/ADT/SmallSet.h
1414
index aeee5f97799aea7e7588d7afba1e47b4fa3d8c7b..4969dfb0d61c2fad805c9cb7bc0184ea6d47bf23 100644

upstream_utils/llvm_patches/0007-Remove-format_provider.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: PJ Reiniger <[email protected]>
33
Date: Sat, 7 May 2022 22:53:50 -0400
4-
Subject: [PATCH 07/38] Remove format_provider
4+
Subject: [PATCH 07/36] Remove format_provider
55

66
---
77
llvm/include/llvm/Support/Chrono.h | 114 ------------------------

upstream_utils/llvm_patches/0008-Add-compiler-warning-pragmas.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: PJ Reiniger <[email protected]>
33
Date: Sun, 8 May 2022 13:34:07 -0400
4-
Subject: [PATCH 08/38] Add compiler warning pragmas
4+
Subject: [PATCH 08/36] Add compiler warning pragmas
55

66
---
77
llvm/include/llvm/ADT/FunctionExtras.h | 11 +++++++++++

0 commit comments

Comments
 (0)