From f9b042b35959ff35dbb4c69da271d7314457d608 Mon Sep 17 00:00:00 2001 From: Dennis Bell Date: Sat, 18 Dec 2021 18:03:41 -0800 Subject: [PATCH] Release v1 from v1.x branch --- ci/pipeline.yml | 3 ++- ci/scripts/shipit | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 29a3f645..67aeef8b 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -41,7 +41,7 @@ meta: uri: (( concat "git@github.com:" meta.github.owner "/" meta.github.repo )) owner: (( param "Please specify the name of the user / organization that owns the Github repository" )) repo: (( param "Please specify the name of the Github repository" )) - branch: master + branch: v1.x private_key: (( param "Please generate an SSH Deployment Key for this repo and specify it here" )) access_token: (( param "Please generate a Personal Access Token to be used for creating github releases (do you have a ci-bot?)" )) @@ -322,6 +322,7 @@ jobs: params: name: gh/name tag: gh/tag + commitish: gh/branch body: gh/notes.md globs: [gh/artifacts/*] - put: version diff --git a/ci/scripts/shipit b/ci/scripts/shipit index c1e2331d..88634651 100755 --- a/ci/scripts/shipit +++ b/ci/scripts/shipit @@ -68,6 +68,7 @@ header "Assembling Github Release Artifacts..." mkdir -p ${RELEASE_ROOT}/artifacts echo "v${VERSION}" > ${RELEASE_ROOT}/tag echo "v${VERSION}" > ${RELEASE_ROOT}/name +echo "$BRANCH" > ${RELEASE_ROOT}/branch mv git/*.tar.gz ${RELEASE_ROOT}/artifacts mv ${REPO_ROOT}/ci/release_notes.md ${RELEASE_ROOT}/notes.md cat > ${RELEASE_ROOT}/notification <