diff --git a/ci/release/README.md b/ci/release/README.md index 10c4c44b2..4530983e4 100644 --- a/ci/release/README.md +++ b/ci/release/README.md @@ -14,10 +14,6 @@ it depends on from ../sub/lib. - ./release.sh is the top level script to generate a new release. Run with --help for usage. -### upload_assets.sh - -- Called by ./release.sh to upload the assets for the release in $VERSION - ## build.sh - ./build.sh builds the release archives for each platform into ./build//*.tar.gz diff --git a/ci/release/_install.sh b/ci/release/_install.sh index 0d47be980..4637489f0 100755 --- a/ci/release/_install.sh +++ b/ci/release/_install.sh @@ -344,7 +344,7 @@ fetch_release_info() { return 0 fi - log "fetching info on version $VERSION" + log "fetching info on $VERSION version of $REPO" RELEASE_INFO=$(mktemp -d)/release-info.json if [ "$VERSION" = latest ]; then release_info_url="https://api.github.com/repos/$REPO/releases/$VERSION" diff --git a/ci/release/release.sh b/ci/release/release.sh index 345f1a8a9..517ae778d 100755 --- a/ci/release/release.sh +++ b/ci/release/release.sh @@ -2,4 +2,4 @@ set -eu cd -- "$(dirname "$0")/../.." -./ci/sub/bin/release.sh "$@" +./ci/sub/release/release.sh "$@" diff --git a/ci/release/upload_assets.sh b/ci/release/upload_assets.sh deleted file mode 100755 index f14da46b6..000000000 --- a/ci/release/upload_assets.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -set -eu -cd -- "$(dirname "$0")/../.." -. ./ci/sub/lib.sh - -help() { - cat < - -Uploads the assets for release to GitHub. - -For example, if is v0.0.99 then it uploads files matching -./ci/release/build/v0.0.99/*.tar.gz to the GitHub release v0.0.99. - -Example: - $0 v0.0.99 -EOF -} - -main() { - while :; do - flag_parse "$@" - case "$FLAG" in - h|help) - help - return 0 - ;; - '') - shift "$FLAGSHIFT" - break - ;; - *) - flag_errusage "unrecognized flag $FLAGRAW" - ;; - esac - done - - if [ $# -ne 1 ]; then - flag_errusage "first argument must be release version like v0.0.99" - fi - VERSION="$1" - shift - - sh_c gh release upload --clobber "$VERSION" "./ci/release/build/$VERSION"/*.tar.gz -} - -main "$@" diff --git a/ci/sub b/ci/sub index c91c28cbc..231dec909 160000 --- a/ci/sub +++ b/ci/sub @@ -1 +1 @@ -Subproject commit c91c28cbcaa8935c4054d7d5f0c28348caed5a2e +Subproject commit 231dec9096304f1a033fd2ef35228d4c6e0744b3