Skip to content

Commit 8c01ea2

Browse files
committed
Publish merge-to-github-006
Synced from the internal repositories by ert-components/scripts/git-utilities/publish_release.sh.
1 parent 012e172 commit 8c01ea2

538 files changed

Lines changed: 17 additions & 408820 deletions

File tree

Some content is hidden

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

scripts/git-utilities/publish_set.py

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,23 @@ def osarch_closure(root, platforms):
150150
text = open(f, errors="ignore").read()
151151
queue += INC_OSARCH.findall(text)
152152
queue += INC_OSARCH_REL.findall(text)
153-
return {d for d in found if os.path.isdir(os.path.join(root, "target/os-arch", d))}
153+
return {d for d in found if _is_osarch_dir(root, d)}
154+
155+
156+
def _is_osarch_dir(root, d):
157+
"""True only for a real directory directly under target/os-arch.
158+
159+
The relative-include regexes capture the leading '..' of a '../../x/' path,
160+
and a bare os.path.isdir() accepts it because target/os-arch/.. is target/.
161+
That put 'target/os-arch/../' in the plan, which rsync resolves to target/ --
162+
so every platform was published regardless of the allow-list, and anything
163+
prune_mirror.sh removed came straight back on the next publish.
164+
"""
165+
if d in (".", "..") or "/" in d or os.sep in d:
166+
return False
167+
base = os.path.realpath(os.path.join(root, "target/os-arch"))
168+
cand = os.path.realpath(os.path.join(base, d))
169+
return cand.startswith(base + os.sep) and os.path.isdir(cand)
154170

155171

156172
def devman_closure(root, platforms):

target/os-arch/macos-x86_64/Components/deps.mk

Lines changed: 0 additions & 14 deletions
This file was deleted.

target/os-arch/macos-x86_64/config.mk

Lines changed: 0 additions & 27 deletions
This file was deleted.

target/os-arch/macos-x86_64/deps.mk

Lines changed: 0 additions & 22 deletions
This file was deleted.

target/os-arch/macos-x86_64/target.mk

Lines changed: 0 additions & 38 deletions
This file was deleted.

target/os-arch/macos-x86_64/toolchain.mk

Lines changed: 0 additions & 14 deletions
This file was deleted.

target/os-arch/qnx-arm64/Components/components.mk

Lines changed: 0 additions & 15 deletions
This file was deleted.

target/os-arch/qnx-arm64/Components/deps.mk

Lines changed: 0 additions & 14 deletions
This file was deleted.

target/os-arch/qnx-arm64/config.mk

Lines changed: 0 additions & 22 deletions
This file was deleted.

target/os-arch/qnx-arm64/deps.mk

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)