diff --git a/Dockerfile b/Dockerfile index 05fc4f0..16f1bf3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN curl -sL https://github.com/cloudfoundry/bosh-cli/releases/download/v${BOSH_ install /dev/stdin /usr/local/bin/bosh && bosh --version # renovate: datasource=github-releases depName=carvel-dev/vendir -ENV VENDIR_VERSION=0.38.0 +ENV VENDIR_VERSION=0.39.0 RUN curl -sL https://github.com/carvel-dev/vendir/releases/download/v${VENDIR_VERSION}/vendir-linux-amd64 | \ install /dev/stdin /usr/local/bin/vendir && vendir -v diff --git a/entrypoint.sh b/entrypoint.sh index 3571e97..976b38d 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -4,14 +4,17 @@ set -e # extract info if [[ "$GITHUB_REF" == refs/tags/* ]]; then + echo "tag detected: $GITHUB_REF" version=${GITHUB_REF#refs/tags/} version=${version#v} tag_version=v${version} release=true elif [[ "$GITHUB_REF" == refs/heads/* ]]; then - version=${GITHUB_REF#refs/heads/} + echo "Head ref detected: $GITHUB_REF" + version=$(echo ${GITHUB_REF#refs/heads/}|tr '/' '_') # Replace / with _ to support PR like renovate/xxxxx release=false elif [[ "$GITHUB_REF" == refs/pull/* ]]; then + echo "PR detected: $GITHUB_REF" pull_number=$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH") version=pr-${pull_number} release=false @@ -102,7 +105,7 @@ else echo "::warning::AWS_BOSH_ACCES_KEY_ID not set, skipping config/private.yml" fi -echo "creating bosh release: ${name}-${version}.tgz" +echo "creating bosh release (name: ${name} - version: ${version}): ${name}-${version}.tgz" if [ "${release}" == "true" ]; then bosh create-release --final --version="${version}" --tarball="${name}-${version}".tgz --force # --force is required to ignore dev_releases/ dir, created during final release else