Skip to content

Upmerge from 3.3 to master #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 7, 2021
Merged

Upmerge from 3.3 to master #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47ccbcc
IBX-656: Updated changelog generator's JQ oneliner
ibexa-yuna Jul 7, 2021
bb862e6
Merge branch 'master' into 3.3
ibexa-yuna Jul 7, 2021
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
7 changes: 7 additions & 0 deletions .github/workflows/release_tag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ jobs:
cat > $FILE2 <<'EOF'
${{ steps.currentLock.outputs.lock }}
EOF
# Get only changed packages and sort versions in ascending order
# Step 1: Merge composer.json from two versions, grouping by .name
# Step 2: Take .versions key and remove duplicate versions (means this bundle did not change)
# Step 3: Select only those bundles that have more than 1 version in .versions
# Step 4: Sort versions
# Step 5: (outer brackets) Wrap that into JSON list of objects
# Note: zzzz is added as an additional suffix to properly sort out alpha/beta/etc pre-releases (v2.5.1-alphazzzz < v2.5.1zzzz)
OUT=$(jq -s 'flatten | group_by(.name)' $FILE1 $FILE2 | jq -s '[ .[][] | {name: (.[0].name), versions: [ .[0].version, .[1].version ] | unique} | select(.versions | length > 1) ] | .[].versions |= sort_by( . + "zzzz" | [scan("[0-9]+|[a-z]+")] | map(tonumber? // .) )')
echo "::set-output name=matrix::$( echo "$OUT" | sed ':a;N;$!ba;s/\n/%0A/g' )"

Expand Down