From d066c64789e63b11459d2ba9ecba971b3c398b88 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Fri, 7 Feb 2020 23:11:32 +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 922b40f..b0caadd 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -17,11 +17,11 @@ local PipelineBuild(arch='amd64') = { 'TZ': 'UTC', }, commands: [ - '[ -z "${DRONE_TAG}" ] && BITWARDEN_VERSION=1.13.1 || BITWARDEN_VERSION=${DRONE_TAG%-*}', + '[ -z "${DRONE_TAG}" ] && BITWARDEN_VERSION=1.13.1 || BITWARDEN_VERSION=${DRONE_TAG##v}', 'mkdir -p source/', 'apt-get -qq update && apt-get install -yqq --no-install-recommends libpq-dev ', 'rustup set profile minimal', - 'curl -sSL https://github.com/dani-garcia/bitwarden_rs/archive/$BITWARDEN_VERSION.tar.gz | tar xz -C source/ --strip-components=1', + 'curl -sSL https://github.com/dani-garcia/bitwarden_rs/archive/${BITWARDEN_VERSION%-*}.tar.gz | tar xz -C source/ --strip-components=1', 'cd source/ && cargo build -j 8 --features $DB --release', ], }, diff --git a/.drone.yml b/.drone.yml index 0121439..bba7600 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,11 +10,11 @@ steps: - name: binary image: clux/muslrust:nightly-2019-12-19 commands: - - "[ -z \"${DRONE_TAG}\" ] && BITWARDEN_VERSION=1.13.1 || BITWARDEN_VERSION=${DRONE_TAG%-*}" + - "[ -z \"${DRONE_TAG}\" ] && BITWARDEN_VERSION=1.13.1 || BITWARDEN_VERSION=${DRONE_TAG##v}" - mkdir -p source/ - "apt-get -qq update && apt-get install -yqq --no-install-recommends libpq-dev " - rustup set profile minimal - - curl -sSL https://github.com/dani-garcia/bitwarden_rs/archive/$BITWARDEN_VERSION.tar.gz | tar xz -C source/ --strip-components=1 + - curl -sSL https://github.com/dani-garcia/bitwarden_rs/archive/${BITWARDEN_VERSION%-*}.tar.gz | tar xz -C source/ --strip-components=1 - cd source/ && cargo build -j 8 --features $DB --release environment: DB: postgresql @@ -129,6 +129,6 @@ depends_on: --- kind: signature -hmac: 8f1d33f3bc93fc9df2058c812d520cc2e8dbb51fcc9ff5b107cf392c6258d070 +hmac: 53263f976931a98f4a183ca1ae703318501080e28c17461befd7e75045114596 ...