Skip to content

Commit

Permalink
Fix issue in 'shipit' when GitHub repo name doesn't follow the '-bosh…
Browse files Browse the repository at this point in the history
…release' suffix convention
  • Loading branch information
bgandon committed Feb 16, 2024
1 parent c74a1a8 commit 57c0649
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions ci/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@ jobs:
NOTIFICATION_OUT: notifications
RELEASE_BRANCH: (( grab meta.github.release_branch ))
GITHUB_OWNER: (( grab meta.github.owner ))
GITHUB_REPO: (( grab meta.github.repo ))
GIT_EMAIL: (( grab meta.git.email ))
GIT_NAME: (( grab meta.git.name ))
AWS_ACCESS_KEY: (( grab meta.aws.access_key ))
Expand Down
5 changes: 3 additions & 2 deletions ci/scripts/shipit
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ header() {
: ${REPO_OUT:?required}
RELEASE_BRANCH=${RELEASE_BRANCH:-"master"}
: ${GITHUB_OWNER:?required}
: ${GITHUB_REPO:?required}
: ${VERSION_FROM:?required}
: ${GIT_EMAIL:?required}
: ${GIT_NAME:?required}
Expand Down Expand Up @@ -81,7 +82,7 @@ popd

release_tgz=${REPO_OUT}/releases/${release_name}/${release_name}-${version}.tgz
export release_sha1=$(sha1sum $release_tgz | head -n1 | awk '{print $1}')
export release_url="https://github.com/${GITHUB_OWNER}/${release_name}-boshrelease/releases/download/v${version}/${release_name}-${version}.tgz"
export release_url="https://github.com/${GITHUB_OWNER}/${GITHUB_REPO}/releases/download/v${version}/${release_name}-${version}.tgz"
echo "RELEASE_SHA1=${release_sha1}"

mkdir -p ${RELEASE_ROOT}/artifacts
Expand Down Expand Up @@ -124,5 +125,5 @@ git commit -m "release v${version}"
popd

cat > ${NOTIFICATION_OUT:-notifications}/message <<EOS
New ${release_name} v${version} released. <https://github.com/${GITHUB_OWNER}/${release_name}-boshrelease/releases/tag/v${version}|Release notes>.
New ${release_name} v${version} released. <https://github.com/${GITHUB_OWNER}/${GITHUB_REPO}/releases/tag/v${version}|Release notes>.
EOS

0 comments on commit 57c0649

Please sign in to comment.