From c130dff0ffdeed0220cd8442e682dc7ceb1ebd4f Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Fri, 7 Feb 2020 23:51:53 +0100 Subject: [PATCH] fix version tagging --- .drone.jsonnet | 4 ++-- .drone.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 83fd1f6..5f9479d 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -17,10 +17,10 @@ local PipelineBuild(arch='amd64') = { 'TZ': 'UTC', }, commands: [ - '[ -z "${DRONE_TAG}" ] && LDAP_VERSION=master || LDAP_VERSION=v${DRONE_TAG%-*}', + '[ -z "${DRONE_TAG}" ] && LDAP_VERSION=master || LDAP_VERSION="${DRONE_TAG%-*}"', 'mkdir -p source/', 'rustup set profile minimal', - 'curl -sSL https://github.com/ViViDboarder/bitwarden_rs_ldap/archive/$LDAP_VERSION.tar.gz | tar xz -C source/ --strip-components=1', + 'curl -sSL https://github.com/ViViDboarder/bitwarden_rs_ldap/archive/"$$LDAP_VERSION".tar.gz | tar xz -C source/ --strip-components=1', "grep -rlI 'Box' source/src/ | xargs sed -i 's/Box/Box/g'", 'cd source/ && cargo build -j 8 --release', ], diff --git a/.drone.yml b/.drone.yml index bd2731f..772636c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,10 +10,10 @@ steps: - name: binary image: clux/muslrust:nightly-2019-12-19 commands: - - "[ -z \"${DRONE_TAG}\" ] && LDAP_VERSION=master || LDAP_VERSION=v${DRONE_TAG%-*}" + - "[ -z \"${DRONE_TAG}\" ] && LDAP_VERSION=master || LDAP_VERSION=\"${DRONE_TAG%-*}\"" - mkdir -p source/ - rustup set profile minimal - - curl -sSL https://github.com/ViViDboarder/bitwarden_rs_ldap/archive/$LDAP_VERSION.tar.gz | tar xz -C source/ --strip-components=1 + - curl -sSL https://github.com/ViViDboarder/bitwarden_rs_ldap/archive/"$$LDAP_VERSION".tar.gz | tar xz -C source/ --strip-components=1 - grep -rlI 'Box' source/src/ | xargs sed -i 's/Box/Box/g' - cd source/ && cargo build -j 8 --release environment: @@ -129,6 +129,6 @@ depends_on: --- kind: signature -hmac: 2c798c2f572c26c6754e55854ff079f761e7f0ffca80f6643b415ac93923be1b +hmac: 7d0047e966a281c570b76b36a741bfe660682662a09bc6c6ebc12fda7d18f951 ...