From f91bd1869c47bd574a50066e47f82ce7ef2c6ffc Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Tue, 2 Jul 2019 11:14:26 +0200 Subject: [PATCH] distro build: push release branches --- build/azure-pipelines/distro-build.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build/azure-pipelines/distro-build.yml b/build/azure-pipelines/distro-build.yml index 639456ad4ce..ab8a5e778c8 100644 --- a/build/azure-pipelines/distro-build.yml +++ b/build/azure-pipelines/distro-build.yml @@ -30,7 +30,13 @@ steps: git remote add distro "https://github.com/$VSCODE_MIXIN_REPO.git" git fetch distro - git push distro origin/master:refs/heads/master + + # Push master branch into master and oss/master + git push distro origin/master:refs/heads/master origin/master:refs/heads/oss/master + + # Push every release branch into oss/release + git for-each-ref --format="%(refname:short)" refs/remotes/origin/release/* | sed 's/^origin\/\(.*\)$/\0:refs\/heads\/oss\/\1/' | xargs git push + git merge $(node -p "require('./package.json').distro") displayName: Sync & Merge Distro \ No newline at end of file -- GitLab