STRLCPY/LIEF

■ ■ ■ ■ ■ ■

.github/deploy.py

		skipped 22 lines
23	23		LIEF_S3_KEY = os.getenv("LIEF_S3_KEY", None)
24	24		LIEF_S3_SECRET = os.getenv("LIEF_S3_SECRET", None)
25	25		OWNED_ORGS = ["lief-project/", "romainthomas/"]
26		-	RELEASE_KEYWORD = "release-"
	26	+	RELEASE_KEYWORD = ["release-", "release/"]
27	27
28	28		DEFAULT_CONFIG = CONFIG_DIR / "gh-ci.toml"
29	29		DEFAULT_TEMPLATE = (ASSET_DIR / "index.j2").read_text()
		skipped 226 lines
256	256		if any(re.match(s, branch) for s in self._branches):
257	257		return True
258	258
259		-	if branch.startswith(RELEASE_KEYWORD):
	259	+	if any(branch.startswith(e) for e in RELEASE_KEYWORD):
260	260		return True
	261	+
	262	+	return False
261	263
262	264		def deploy(self, directories: list[str]):
263	265		s3dir = None
		skipped 8 lines
272	274		logger.warning("Can't resolve the branch name")
273	275		sys.exit(1)
274	276
275		-	if branch.startswith(RELEASE_KEYWORD):
276		-	_, s3dir = branch.split(RELEASE_KEYWORD)
277		-	elif self.is_main_branch(branch):
278		-	s3dir = self._default_dir
279		-	else:
280		-	s3dir = branch.replace("/", "-").replace("_", "-")
	277	+	for rel_kwrd in RELEASE_KEYWORD:
	278	+	if branch.startswith(rel_kwrd):
	279	+	_, s3dir = branch.split(rel_kwrd)
	280	+	if s3dir is None:
	281	+
	282	+	if self.is_main_branch(branch):
	283	+	s3dir = self._default_dir
	284	+	else:
	285	+	s3dir = branch.replace("/", "-").replace("_", "-")
281	286
282	287		if not self.should_be_deployed(branch):
283	288		logger.info("Skipping deployment for branch: %s", branch)
		skipped 36 lines

■ ■ ■ ■ ■ ■

api/python/backend/versioning.py

		skipped 55 lines
56	56		_, version = branch.split("release-")
57	57		return version
58	58
	59	+	if branch is not None and branch.startswith("release/"):
	60	+	_, version = branch.split("release/")
	61	+	return version
	62	+
59	63		parts = version.split('-')
60	64		assert len(parts) in (3, 4)
61	65		dirty = len(parts) == 4
		skipped 58 lines

■ ■ ■ ■ ■ ■

cmake/LIEFGit.cmake

		skipped 46 lines
47	47		if (${LIEF_IS_TAGGED})
48	48		message(STATUS "Tag: ${LIEF_GIT_TAG}")
49	49		else()
50		-	if(LIEF_GIT_BRANCH MATCHES "^release-")
	50	+	if(LIEF_GIT_BRANCH MATCHES "^release[-/]")
51	51		string(REGEX MATCHALL "([0-9]+)" VERSION_STRING "${LIEF_GIT_BRANCH}")
52	52		message(STATUS "${VERSION_STRING}")
53	53		endif()
		skipped 7 lines
61	61		list(GET VERSION_STRING 2 LIEF_VERSION_PATCH)
62	62
63	63		if (NOT ${LIEF_IS_TAGGED})
64		-	if(LIEF_GIT_BRANCH MATCHES "^release-")
	64	+	if(LIEF_GIT_BRANCH MATCHES "^release[-/]")
65	65		message(STATUS "Release branch")
66	66		else()
67	67		MATH(EXPR LIEF_VERSION_MINOR "${LIEF_VERSION_MINOR}+1")
		skipped 10 lines