Skip to content

Commit 35a3fd4

Browse files
rluboscarlescufi
authored andcommitted
scripts: west_commands: Remove stale revert workarounds for ncs-loot
Remove outdated workaround entries (meaning all of them). Leave one commented-out entry to serve as an example for the future. Signed-off-by: Robert Lubos <[email protected]>
1 parent ad4513b commit 35a3fd4

File tree

1 file changed

+4
-36
lines changed

1 file changed

+4
-36
lines changed

scripts/west_commands/ncs_west_helpers.py

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -233,42 +233,10 @@ def _downstream_outstanding_commits(self) -> list[pygit2.Commit]:
233233

234234
# Temporary workaround for any commit(s) that are known
235235
# to specify incorrect SHAs of the commits they revert.
236-
if self.downstream_repo.name == 'zephyr':
237-
if rsha == '8027617116b66548dc6d115af8cca84282adc87e':
238-
rsha = 'd269d6fcc54c9f03bb19419120ce3a57f69a6a88'
239-
if rsha == 'a278ee4af1397201e4b9a8431d601c3e64d34a6b':
240-
rsha = '4f9ab7947c5214f837d806b33d3cb5262ff9bc83'
241-
if rsha == '9a0b81bf553b937f2ecb729a4ae9dff6df93919f':
242-
rsha = '9a675fa35fbd88a3464aaf015f68dff3fa22090a'
243-
if rsha == '500609863634bf00a675146dcb78f5137aed330a':
244-
rsha = '188ec35dc3785cf4e498434ebb55bdf47b08061b'
245-
if rsha == 'e02f019aaac99993da5e39a986c2345eeac22dfc':
246-
rsha = '045899a31200e2b57627442ced7cb80916270fb2'
247-
if rsha == '8d6a853718ee5be65221d5187fa32793e44b8bdb':
248-
rsha = '7db6fe0372890ceb24f9c644203261ba242f5792'
249-
if rsha == '38f2104a801b1db40ab4596f972c0178f21821c5':
250-
rsha = 'f787d7b1dd2cd768dd849c95f00ecac6b399b005'
251-
if rsha == 'b0ce7fe23a0c83ce3038baf2b8899e0e6b1497fc':
252-
rsha = 'ccd2f6324256a9dd7cdba83b1b4b8f5627df77ac'
253-
if rsha == '687cefae54d14d19010ec95b6a6a89eedb6da5b0':
254-
rsha = 'eefa2fee0b36fb0a502e7b44fc4a2d90e5cf23bb'
255-
# Commit 34ac0f01d11fd78304df355cc139479bb32e511e that
256-
# contains this incorrect SHA reference reverts in fact
257-
# only a part of 29b9b3e2052e7022ce8a5c197612e08d75796535,
258-
# so just ignore it.
259-
if rsha == '330eb8146a5b694fb90d738cc04e6ef76d80f636':
260-
continue
261-
# Commit 08b6e7604926f6a2ec5eca9d4058f2f3fbc11e6e that
262-
# contains this incorrect SHA reference reverts in fact
263-
# only a part of 5eec5ca2ac59038194a91b7086edc50949ed83c9,
264-
# so just ignore it.
265-
if rsha == 'fe339b14b3effd069458f5e4710f17cda8295229':
266-
continue
267-
# Revert 5156ca3db2741f009306aaa555c9bb70d9fe8777
268-
# references the wrong commit, the correct reference is
269-
# b381f5633df2f28c318bc86cf6fc9d059e57a056
270-
if sha == '5156ca3db2741f009306aaa555c9bb70d9fe8777':
271-
rsha = 'b381f5633df2f28c318bc86cf6fc9d059e57a056'
236+
# For example:
237+
# if self.downstream_repo.name == 'zephyr':
238+
# if rsha == '8027617116b66548dc6d115af8cca84282adc87e':
239+
# rsha = 'd269d6fcc54c9f03bb19419120ce3a57f69a6a88'
272240

273241
if rsha in downstream_out:
274242
log.dbg('** commit {} ("{}") was reverted in {}'.

0 commit comments

Comments
 (0)