diff --git a/.drone.jsonnet b/.drone.jsonnet index fde4716..b1c1e17 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -17,11 +17,12 @@ local PipelineBuild(arch='amd64') = { 'TZ': 'UTC', }, commands: [ - '[ -z "${DRONE_TAG}" ] && BITWARDEN_VERSION=1.13.1 || BITWARDEN_VERSION=${DRONE_TAG##v}', + '[ -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', + 'echo "${BITWARDEN_VERSION%-*}".tar.gz', + '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 0ae8c2c..4f30e80 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,11 +10,12 @@ steps: - name: binary image: clux/muslrust:nightly-2019-12-19 commands: - - "[ -z \"${DRONE_TAG}\" ] && BITWARDEN_VERSION=1.13.1 || BITWARDEN_VERSION=${DRONE_TAG##v}" + - "[ -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 + - echo "${BITWARDEN_VERSION%-*}".tar.gz + - 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 +130,6 @@ depends_on: --- kind: signature -hmac: 925963dd226c05ec738e93cacc279c36dc46f497b23fa97c5968552d96702b35 +hmac: fd327703fea3606dffd72ca8dd7cc0639ea43f04773db41489f6b256331cae5f ...