Merge pull request #16067 from jfrazelle/fix-release-branch-in-suites-script
fix release branch in suites.sh
This commit is contained in:
commit
9b072fb722
1 changed files with 2 additions and 1 deletions
|
@ -8,4 +8,5 @@ targets_from() {
|
|||
git ls-tree -r --name-only origin/master contrib/builder/deb | grep '/Dockerfile$' | sed -r 's!^contrib/builder/deb/|-debootstrap|/Dockerfile$!!g'
|
||||
}
|
||||
|
||||
{ targets_from master; targets_from release; } | sort -u
|
||||
release_branch=$(git ls-remote --heads https://github.com/docker/docker.git | awk -F 'refs/heads/' '$2 ~ /^release/ { print $2 }' | sort -V | tail -1)
|
||||
{ targets_from master; targets_from "$release_branch"; } | sort -u
|
||||
|
|
Loading…
Reference in a new issue