From 144f6090c103ce9145ef160daee80b684772a77f Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Wed, 28 Jun 2023 14:40:02 +0200 Subject: [PATCH] ci: filenames and paths --- .drone.yml | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9d0c033..f592b47 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,34 +17,25 @@ steps: - cd sanoid - # checkout latest stable release or stay on master for bleeding edge stuff (but expect bugs!) - git checkout $(git tag | grep "^v" | tail -n 1) + - version=$(git tag | grep "^v" | tail -n 1) - ln -s packages/debian . - dpkg-buildpackage -uc -us - - cd .. - - ls -lah - - pwd - - BUILD_DIR="./tmp" - - OUTPUT_DIR="./output" - - GIT_COMMIT_ID=$(git rev-parse --short HEAD) # git-commit-id: z.B. 39d35da - - VERSION=$(git rev-list --all --count) # Anzahl aller Commits (int) - - GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD) # branch-Name - - name: upload image: registry.mgrote.net/allzweckcontainer:latest # privates Image, Pull-Secret notwendig environment: DEBIAN_FRONTEND: noninteractive auth_token: from_secret: httpd-api-server-token - commands: - - pwd - - ls -lah ./sanhoid/output/ - # upload + commands: # upload + - cp "../sanoid_${version}_all.deb" "../sanoid_latest_all.deb" + - cp "../sanoid_${version}_all.deb" "../sanoid_${DRONE_COMMIT_BRANCH}_all.deb" - | - curl -X POST -H "token: $auth_token" -F "file=@./sanhoid/output/sanhoid-${DRONE_COMMIT_SHA:0:8}.tar.gz" http://docker10.grote.lan:5040/upload + curl -X POST -H "token: $auth_token" -F "file=@../sanoid_${version}_all.deb" http://docker10.grote.lan:5040/upload - | - curl -X POST -H "token: $auth_token" -F "file=@./sanhoid/output/sanhoid-${DRONE_COMMIT_BRANCH}.tar.gz" http://docker10.grote.lan:5040/upload + curl -X POST -H "token: $auth_token" -F "file=@../sanoid_${DRONE_COMMIT_BRANCH}_all.deb" http://docker10.grote.lan:5040/upload - | - curl -X POST -H "token: $auth_token" -F "file=@./sanhoid/output/sanhoid-latest.tar.gz" http://docker10.grote.lan:5040/upload + curl -X POST -H "token: $auth_token" -F "file=@../sanoid_latest_all.deb" http://docker10.grote.lan:5040/upload image_pull_secrets: # wird für den Login auf registry.mgrote.net benötigt - dockerconfigjson