The open source OpenXR runtime
scripts: Update copybara script to do Catch2 upgrades.
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2447>
authored by
Rylie Pavlik
and committed by
Marge Bot
5546cd90
438adbaa
+7
-6
+7
-6
scripts/copy.bara.sky
+7
-6
scripts/copy.bara.sky
···
41
41
42
42
43
43
# update-nanopb: Update NanoPB library
44
-
# WARNING: Also requires update of the generated .pb.h and .pb.c files,
44
+
# WARNING: May also require update of the generated .pb.h and .pb.c files,
45
45
# not currently done by this code!
46
46
core.workflow(
47
47
name="update-nanopb",
···
115
115
],
116
116
)
117
117
118
-
# update-catch2: Update Catch2 library, in case there's another 2.x release
118
+
# update-catch2: Update Catch2 library (amalgamated version)
119
119
core.workflow(
120
120
name="update-catch2",
121
+
custom_rev_id="CATCH2_REV_ID",
121
122
origin=git.github_origin(
122
123
url="https://github.com/catchorg/Catch2.git",
123
-
# ref = "master",
124
124
describe_version=True,
125
125
version_selector=core.latest_version(
126
126
format="refs/tags/v${n0}.${n1}.${n2}",
127
127
regex_groups={
128
-
"n0": "2",
128
+
"n0": "3",
129
129
"n1": "[0-9]+",
130
130
"n2": "[0-9]+",
131
131
},
···
137
137
push="update-catch2",
138
138
),
139
139
destination_files=glob(["src/external/Catch2/*"]),
140
-
origin_files=glob(["single_include/catch2/catch.hpp"]),
140
+
origin_files=glob(["extras/catch_amalgamated.*", "LICENSE.txt"]),
141
141
authoring=authoring.pass_thru(author),
142
142
transformations=[
143
143
metadata.expose_label("GIT_DESCRIBE_CHANGE_VERSION"),
144
144
metadata.replace_message(
145
145
"external/Catch2: Update Catch2 from upstream ${GIT_DESCRIBE_CHANGE_VERSION}"
146
146
),
147
-
core.move("single_include/catch2/catch.hpp", "src/external/Catch2/catch/"),
147
+
core.move("extras/", "src/external/Catch2/"),
148
+
core.move("LICENSE.txt", "src/external/Catch2/LICENSE.txt"),
148
149
],
149
150
)
150
151