diff --git a/.ci.yml b/.ci.yml index b04a04dd..053c49e7 100644 --- a/.ci.yml +++ b/.ci.yml @@ -43,15 +43,15 @@ steps: TARGET: aarch64-apple-darwin VERSION: ${DRONE_TAG} ARTIFACT: aarch64-apple-darwin - HUBPATH: - from_secret: hubpath + TOOLDIR: + from_secret: tooldir GITHUB_TOKEN: from_secret: github_token commands: - source $SRCENV/.cargo/env - export RUSTUP_HOME=$SRCENV/.rustup - make bundle - - $HUBPATH release edit $(find . -type f -name "*.zip" -printf "-a %p ") -m "" "$VERSION" + - $TOOLDIR/hub release edit $($TOOLDIR/gfind . -type f -name "*.zip" -printf "-a %p ") -m "" "$VERSION" when: event: - tag diff --git a/Makefile b/Makefile index 2b01936a..79f50018 100644 --- a/Makefile +++ b/Makefile @@ -89,11 +89,12 @@ else ifneq ($(origin CARGO_TARGET_DIR),undefined) # target defined and target dir. use this instead of target/ BUNDLE+=zip -j sky-bundle-${VERSION}-${ARTIFACT}.zip ${CARGO_TARGET_DIR}/${TARGET}/release/skysh ${CARGO_TARGET_DIR}/${TARGET}/release/skyd ${CARGO_TARGET_DIR}/${TARGET}/release/sky-bench -endif +else # just the plain old target/${TARGET} path BUNDLE+=zip -j sky-bundle-${VERSION}-${ARTIFACT}.zip target/${TARGET}/release/skysh target/${TARGET}/release/skyd target/${TARGET}/release/sky-bench endif endif +endif .pre: @echo "===================================================================="