Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/pull-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,12 @@ jobs:
cat /tmp/changed-files-in-pr
totalcnt="$(cat /tmp/changed-files-in-pr | wc -l)"
echo "totalcount=$totalcnt" >> $GITHUB_OUTPUT
echo "In total that are $totalcnt files."
#
cat /tmp/changed-files-in-pr | grep -v '^package-lock.json$' | grep -v '^composer.lock$' | grep -v '^\.github/workflows/' | grep -v '^docs/Gemfile.lock' > /tmp/relevant-files-in-pr
echo "Filtering out automatically updatable files"
cat /tmp/changed-files-in-pr | grep -v '^package-lock.json$' | grep -v '^composer.lock$' | grep -v '^\.github/workflows/' | grep -v '^docs/Gemfile.lock' | tee /tmp/relevant-files-in-pr
cnt="$(cat /tmp/relevant-files-in-pr | wc -l)"
echo "That are $cnt files relevant."
echo "num=$cnt" >> $GITHUB_OUTPUT
#
echo "That are $totalcnt changed files. After reducing the number there are $cnt files left."
Expand Down
12 changes: 8 additions & 4 deletions .helpers/changelog/changelog_builder/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,17 @@ def fixByUpstream(prs):
prs = fixByUpstream(prs)

prsFixed = { k:v for k,v in prs.items() }
dropProvidedPRId = False
if args.pr is not None:
prsFixed.pop(int(args.pr))
try:
prsFixed.pop(int(args.pr))
except KeyError:
dropProvidedPRId = True

_l.debug('Fixed data: %s', prs)
_l.debug('Fixed data (PR filtered out): %s', prsFixed)

def getSortedPRIds(prs):
def getSortedPRIds(prs, dropProvidedPRId):
mergeMap = {}
for pr in prs:
mergeMap[prs[pr]['merge_sha']] = pr
Expand Down Expand Up @@ -115,12 +119,12 @@ def getSortedPRIds(prs):
mergeOrder.append(prId)
mergeOrder.reverse()

if args.pr is not None:
if args.pr is not None and not dropProvidedPRId:
mergeOrder.append(int(args.pr))

return mergeOrder

mergeOrder = getSortedPRIds(prsFixed)
mergeOrder = getSortedPRIds(prsFixed, dropProvidedPRId)
_l.debug('Sorted PRs: %s', mergeOrder)

def getTotalChangelog():
Expand Down
101 changes: 94 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.