diff --git a/flake.nix b/flake.nix index afdc790..9cee677 100644 --- a/flake.nix +++ b/flake.nix @@ -122,8 +122,7 @@ ${pre-commit-check.shellHook} if [ -t 1 ]; then - : - # command -v tput >/dev/null 2>&1 && tput clear || printf '\033c' + command -v tput >/dev/null 2>&1 && tput clear || printf '\033c' fi GREEN='\033[1;32m' @@ -151,27 +150,13 @@ # line 2: CHANNEL (stable|alpha|beta|rc|internal|...) # line 3: N (prerelease number, 0 for stable) postVersion ? "", - # Shell string — runs after VERSION + versionFiles are written, before git add. + # Shell string — runs after VERSION + release steps are written/run, before git add. # Same env vars available. - versionFiles ? [ ], - # List of { path, template } attrsets. - # template is a Nix function: version -> string - # The content is fully rendered by Nix at eval time — no shell interpolation needed. - # Example: - # versionFiles = [ - # { - # path = "src/version.ts"; - # template = version: ''export const APP_VERSION = "${version}" as const;''; - # } - # { - # path = "internal/version/version.go"; - # template = version: '' - # package version - # - # const Version = "${version}" - # ''; - # } - # ]; + release ? [ ], + # Unified list processed in declaration order: + # { file = "path/to/file"; content = ''...$FULL_VERSION...''; } # write file + # { run = ''...shell snippet...''; } # run script + # Runtime env includes: BASE_VERSION, CHANNEL, PRERELEASE_NUM, FULL_VERSION, FULL_TAG. channels ? [ "alpha" "beta" @@ -186,35 +171,34 @@ pkgs = import nixpkgs { inherit system; }; channelList = pkgs.lib.concatStringsSep " " channels; - # Version files are fully rendered by Nix at eval time. - # The shell only writes the pre-computed strings — no shell interpolation in templates. - versionFilesScript = pkgs.lib.concatMapStrings ( - f: - let - # We can't call f.template here since FULL_VERSION is a runtime value. - # Instead we pass the path and use a shell heredoc with the template - # rendered at runtime via the VERSION env vars. - renderedContent = f.template "$FULL_VERSION"; - in - '' - mkdir -p "$(dirname "${f.path}")" - cat > "${f.path}" << 'NIXEOF' - ${renderedContent} - NIXEOF - log "Generated version file: ${f.path}" - '' - ) versionFiles; + releaseStepsScript = pkgs.lib.concatMapStrings ( + entry: + if entry ? file then + '' + mkdir -p "$(dirname "${entry.file}")" + cat > "${entry.file}" << NIXEOF + ${entry.content} + NIXEOF + log "Generated version file: ${entry.file}" + '' + else if entry ? run then + '' + ${entry.run} + '' + else + builtins.throw "release entry must have either 'file' or 'run'" + ) release; script = builtins.replaceStrings [ "__CHANNEL_LIST__" - "__VERSION_FILES__" + "__RELEASE_STEPS__" "__POST_VERSION__" ] [ channelList - versionFilesScript + releaseStepsScript postVersion ] (builtins.readFile ./packages/release/release.sh); @@ -237,18 +221,20 @@ }; # ── packages ──────────────────────────────────────────────────────────── - packages = forAllSystems ( - system: - let - pkgs = import nixpkgs { inherit system; }; - in - { - # Expose a no-op release package for the lib repo itself (dogfood) - release = self.lib.mkRelease { - inherit system; - }; - } - ); + packages = forAllSystems (system: { + # Expose a no-op release package for the lib repo itself (dogfood) + release = self.lib.mkRelease { + inherit system; + release = [ + { + run = '' + sed -E -i "s#^([[:space:]]*devshell-lib\\.url = \")git\\+https://git\\.dgren\\.dev/eric/nix-flake-lib[^"]*(\";)#\\1git+https://git.dgren.dev/eric/nix-flake-lib?ref=$FULL_TAG\\2#" "$ROOT_DIR/template/flake.nix" + log "Updated template/flake.nix devshell-lib ref to $FULL_TAG" + ''; + } + ]; + }; + }); # ── devShells ─────────────────────────────────────────────────────────── devShells = forAllSystems ( diff --git a/packages/release/release.nix b/packages/release/release.nix index 44074af..d811248 100644 --- a/packages/release/release.nix +++ b/packages/release/release.nix @@ -1,13 +1,11 @@ # release.nix { pkgs, - # Source of truth is always $ROOT_DIR/VERSION. - # Format: - # line 1: X.Y.Z - # line 2: CHANNEL (stable|alpha|beta|rc|internal|...) - # line 3: N (prerelease number, 0 for stable) postVersion ? "", - versionFiles ? [ ], + release ? [ ], + # Unified list, processed in declaration order: + # { file = "path/to/file"; content = "..."; } — write file + # { run = "shell snippet..."; } — run script channels ? [ "alpha" "beta" @@ -19,24 +17,28 @@ let channelList = pkgs.lib.concatStringsSep " " channels; - versionFilesScript = pkgs.lib.concatMapStrings (f: '' - mkdir -p "$(dirname "${f.path}")" - ${f.content} > "${f.path}" - log "Generated version file: ${f.path}" - '') versionFiles; + releaseScript = pkgs.lib.concatMapStrings ( + entry: + if entry ? file then + '' + mkdir -p "$(dirname "${entry.file}")" + cat > "${entry.file}" << NIXEOF + ${entry.content} + NIXEOF + log "Generated version file: ${entry.file}" + '' + else if entry ? run then + '' + ${entry.run} + '' + else + builtins.throw "release entry must have either 'file' or 'run'" + ) release; script = builtins.replaceStrings - [ - "__CHANNEL_LIST__" - "__VERSION_FILES__" - "__POST_VERSION__" - ] - [ - channelList - versionFilesScript - postVersion - ] + [ "__CHANNEL_LIST__" "__RELEASE_STEPS__" "__POST_VERSION__" ] + [ channelList releaseScript postVersion ] (builtins.readFile ./release.sh); in pkgs.writeShellApplication { diff --git a/packages/release/release.sh b/packages/release/release.sh index dc46a0c..90a4d0d 100644 --- a/packages/release/release.sh +++ b/packages/release/release.sh @@ -12,161 +12,162 @@ CREATED_TAG="" log() { echo "[release] $*" >&2; } usage() { - local cmd - cmd="$(basename "$0")" - printf '%s\n' \ - "Usage:" \ - " ${cmd} [major|minor|patch] [stable|__CHANNEL_LIST__]" \ - " ${cmd} set " \ - "" \ - "Bump types:" \ - " (none) bump patch, keep current channel" \ - " major/minor/patch bump the given part, keep current channel" \ - " stable / full remove prerelease suffix" \ - " __CHANNEL_LIST__ switch channel (bumps prerelease number if same base+channel)" \ - "" \ - "Examples:" \ - " ${cmd} # patch bump on current channel" \ - " ${cmd} minor # minor bump on current channel" \ - " ${cmd} patch beta # patch bump, switch to beta channel" \ - " ${cmd} rc # switch to rc channel" \ - " ${cmd} stable # promote to stable release" \ - " ${cmd} set 1.2.3" \ - " ${cmd} set 1.2.3-beta.1" + local cmd + cmd="$(basename "$0")" + printf '%s\n' \ + "Usage:" \ + " ${cmd} [major|minor|patch] [stable|__CHANNEL_LIST__]" \ + " ${cmd} set " \ + "" \ + "Bump types:" \ + " (none) bump patch, keep current channel" \ + " major/minor/patch bump the given part, keep current channel" \ + " stable / full remove prerelease suffix" \ + " __CHANNEL_LIST__ switch channel (bumps prerelease number if same base+channel)" \ + "" \ + "Examples:" \ + " ${cmd} # patch bump on current channel" \ + " ${cmd} minor # minor bump on current channel" \ + " ${cmd} patch beta # patch bump, switch to beta channel" \ + " ${cmd} rc # switch to rc channel" \ + " ${cmd} stable # promote to stable release" \ + " ${cmd} set 1.2.3" \ + " ${cmd} set 1.2.3-beta.1" } # ── git ──────────────────────────────────────────────────────────────────── require_clean_git() { - if ! git diff --quiet || ! git diff --cached --quiet; then - echo "Error: git working tree is not clean. Commit or stash changes first." >&2 - exit 1 - fi + if ! git diff --quiet || ! git diff --cached --quiet; then + echo "Error: git working tree is not clean. Commit or stash changes first." >&2 + exit 1 + fi } revert_on_failure() { - local status=$? - if [[ -n $START_HEAD ]]; then - log "Release failed — reverting to $START_HEAD" - git reset --hard "$START_HEAD" - fi - if [[ -n $CREATED_TAG ]]; then - git tag -d "$CREATED_TAG" >/dev/null 2>&1 || true - fi - exit $status + local status=$? + if [[ -n $START_HEAD ]]; then + log "Release failed — reverting to $START_HEAD" + git reset --hard "$START_HEAD" + fi + if [[ -n $CREATED_TAG ]]; then + git tag -d "$CREATED_TAG" >/dev/null 2>&1 || true + fi + exit $status } # ── version parsing ──────────────────────────────────────────────────────── parse_base_version() { - local v="$1" - if [[ ! $v =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then - echo "Error: invalid base version '$v' (expected x.y.z)" >&2 - exit 1 - fi - MAJOR="${BASH_REMATCH[1]}" - MINOR="${BASH_REMATCH[2]}" - PATCH="${BASH_REMATCH[3]}" + local v="$1" + if [[ ! $v =~ ^([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then + echo "Error: invalid base version '$v' (expected x.y.z)" >&2 + exit 1 + fi + MAJOR="${BASH_REMATCH[1]}" + MINOR="${BASH_REMATCH[2]}" + PATCH="${BASH_REMATCH[3]}" } parse_full_version() { - local v="$1" - CHANNEL="stable" - PRERELEASE_NUM="" + local v="$1" + CHANNEL="stable" + PRERELEASE_NUM="" - if [[ $v =~ ^([0-9]+\.[0-9]+\.[0-9]+)-([a-zA-Z]+)\.([0-9]+)$ ]]; then - BASE_VERSION="${BASH_REMATCH[1]}" - CHANNEL="${BASH_REMATCH[2]}" - PRERELEASE_NUM="${BASH_REMATCH[3]}" - elif [[ $v =~ ^([0-9]+\.[0-9]+\.[0-9]+)$ ]]; then - BASE_VERSION="${BASH_REMATCH[1]}" - else - echo "Error: invalid version '$v' (expected x.y.z or x.y.z-channel.N)" >&2 - exit 1 - fi - parse_base_version "$BASE_VERSION" + if [[ $v =~ ^([0-9]+\.[0-9]+\.[0-9]+)-([a-zA-Z]+)\.([0-9]+)$ ]]; then + BASE_VERSION="${BASH_REMATCH[1]}" + CHANNEL="${BASH_REMATCH[2]}" + PRERELEASE_NUM="${BASH_REMATCH[3]}" + elif [[ $v =~ ^([0-9]+\.[0-9]+\.[0-9]+)$ ]]; then + BASE_VERSION="${BASH_REMATCH[1]}" + else + echo "Error: invalid version '$v' (expected x.y.z or x.y.z-channel.N)" >&2 + exit 1 + fi + parse_base_version "$BASE_VERSION" } validate_channel() { - local ch="$1" - [[ $ch == "stable" ]] && return 0 - local valid_channels="__CHANNEL_LIST__" - for c in $valid_channels; do - [[ $ch == "$c" ]] && return 0 - done - echo "Error: unknown channel '$ch'. Valid channels: stable $valid_channels" >&2 - exit 1 + local ch="$1" + [[ $ch == "stable" ]] && return 0 + local valid_channels="__CHANNEL_LIST__" + for c in $valid_channels; do + [[ $ch == "$c" ]] && return 0 + done + echo "Error: unknown channel '$ch'. Valid channels: stable $valid_channels" >&2 + exit 1 } version_cmp() { - # Returns: 0 if equal, 1 if v1 > v2, 2 if v1 < v2 - # Stable > prerelease for same base version - local v1="$1" v2="$2" - [[ $v1 == "$v2" ]] && return 0 + # Returns: 0 if equal, 1 if v1 > v2, 2 if v1 < v2 + # Stable > prerelease for same base version + local v1="$1" v2="$2" + [[ $v1 == "$v2" ]] && return 0 - local base1="" pre1="" base2="" pre2="" - if [[ $v1 =~ ^([0-9]+\.[0-9]+\.[0-9]+)-(.+)$ ]]; then - base1="${BASH_REMATCH[1]}" - pre1="${BASH_REMATCH[2]}" - else - base1="$v1" - fi - if [[ $v2 =~ ^([0-9]+\.[0-9]+\.[0-9]+)-(.+)$ ]]; then - base2="${BASH_REMATCH[1]}" - pre2="${BASH_REMATCH[2]}" - else - base2="$v2" - fi + local base1="" pre1="" base2="" pre2="" + if [[ $v1 =~ ^([0-9]+\.[0-9]+\.[0-9]+)-(.+)$ ]]; then + base1="${BASH_REMATCH[1]}" + pre1="${BASH_REMATCH[2]}" + else + base1="$v1" + fi + if [[ $v2 =~ ^([0-9]+\.[0-9]+\.[0-9]+)-(.+)$ ]]; then + base2="${BASH_REMATCH[1]}" + pre2="${BASH_REMATCH[2]}" + else + base2="$v2" + fi - if [[ $base1 != "$base2" ]]; then - local highest_base - highest_base=$(printf '%s\n%s\n' "$base1" "$base2" | sort -V | tail -n1) - [[ $highest_base == "$base1" ]] && return 1 || return 2 - fi + if [[ $base1 != "$base2" ]]; then + local highest_base + highest_base=$(printf '%s\n%s\n' "$base1" "$base2" | sort -V | tail -n1) + [[ $highest_base == "$base1" ]] && return 1 || return 2 + fi - [[ -z $pre1 && -n $pre2 ]] && return 1 # stable > prerelease - [[ -n $pre1 && -z $pre2 ]] && return 2 # prerelease < stable - [[ -z $pre1 && -z $pre2 ]] && return 0 # both stable + [[ -z $pre1 && -n $pre2 ]] && return 1 # stable > prerelease + [[ -n $pre1 && -z $pre2 ]] && return 2 # prerelease < stable + [[ -z $pre1 && -z $pre2 ]] && return 0 # both stable - local highest_pre - highest_pre=$(printf '%s\n%s\n' "$pre1" "$pre2" | sort -V | tail -n1) - [[ $highest_pre == "$pre1" ]] && return 1 || return 2 + local highest_pre + highest_pre=$(printf '%s\n%s\n' "$pre1" "$pre2" | sort -V | tail -n1) + [[ $highest_pre == "$pre1" ]] && return 1 || return 2 } bump_base_version() { - case "$1" in - major) - MAJOR=$((MAJOR + 1)) - MINOR=0 - PATCH=0 - ;; - minor) - MINOR=$((MINOR + 1)) - PATCH=0 - ;; - patch) PATCH=$((PATCH + 1)) ;; - *) - echo "Error: unknown bump part '$1'" >&2 - exit 1 - ;; - esac - BASE_VERSION="${MAJOR}.${MINOR}.${PATCH}" + case "$1" in + major) + MAJOR=$((MAJOR + 1)) + MINOR=0 + PATCH=0 + ;; + minor) + MINOR=$((MINOR + 1)) + PATCH=0 + ;; + patch) PATCH=$((PATCH + 1)) ;; + *) + echo "Error: unknown bump part '$1'" >&2 + exit 1 + ;; + esac + BASE_VERSION="${MAJOR}.${MINOR}.${PATCH}" } compute_full_version() { - if [[ $CHANNEL == "stable" || -z $CHANNEL ]]; then - FULL_VERSION="$BASE_VERSION" - else - FULL_VERSION="${BASE_VERSION}-${CHANNEL}.${PRERELEASE_NUM:-1}" - fi - export BASE_VERSION CHANNEL PRERELEASE_NUM FULL_VERSION + if [[ $CHANNEL == "stable" || -z $CHANNEL ]]; then + FULL_VERSION="$BASE_VERSION" + else + FULL_VERSION="${BASE_VERSION}-${CHANNEL}.${PRERELEASE_NUM:-1}" + fi + FULL_TAG="v$FULL_VERSION" + export BASE_VERSION CHANNEL PRERELEASE_NUM FULL_VERSION FULL_TAG } # ── gitlint ──────────────────────────────────────────────────────────────── get_gitlint_title_regex() { - [[ ! -f $GITLINT_FILE ]] && return 0 - awk ' + [[ ! -f $GITLINT_FILE ]] && return 0 + awk ' /^\[title-match-regex\]$/ { in_section=1; next } /^\[/ { in_section=0 } in_section && /^regex=/ { sub(/^regex=/, ""); print; exit } @@ -174,22 +175,22 @@ get_gitlint_title_regex() { } validate_commit_message() { - local msg="$1" - local regex - regex="$(get_gitlint_title_regex)" - if [[ -n $regex && ! $msg =~ $regex ]]; then - echo "Error: commit message does not match .gitlint title-match-regex" >&2 - echo "Regex: $regex" >&2 - echo "Message: $msg" >&2 - exit 1 - fi + local msg="$1" + local regex + regex="$(get_gitlint_title_regex)" + if [[ -n $regex && ! $msg =~ $regex ]]; then + echo "Error: commit message does not match .gitlint title-match-regex" >&2 + echo "Regex: $regex" >&2 + echo "Message: $msg" >&2 + exit 1 + fi } # ── version file generation ──────────────────────────────────────────────── -generate_version_files() { - : - __VERSION_FILES__ +run_release_steps() { + : + __RELEASE_STEPS__ } # ── version source (built-in) ────────────────────────────────────────────── @@ -198,195 +199,196 @@ generate_version_files() { # Must be called outside of any subshell so log output stays on stderr # and never contaminates the stdout of do_read_version. init_version_file() { - if [[ -f "$ROOT_DIR/VERSION" ]]; then - return 0 - fi + if [[ -f "$ROOT_DIR/VERSION" ]]; then + return 0 + fi - local highest_tag="" - while IFS= read -r raw_tag; do - local tag="${raw_tag#v}" - [[ $tag =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z]+\.[0-9]+)?$ ]] || continue + local highest_tag="" + while IFS= read -r raw_tag; do + local tag="${raw_tag#v}" + [[ $tag =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z]+\.[0-9]+)?$ ]] || continue - if [[ -z $highest_tag ]]; then - highest_tag="$tag" - continue - fi + if [[ -z $highest_tag ]]; then + highest_tag="$tag" + continue + fi - local cmp_status=0 - version_cmp "$tag" "$highest_tag" || cmp_status=$? - [[ $cmp_status -eq 1 ]] && highest_tag="$tag" - done < <(git tag --list) + local cmp_status=0 + version_cmp "$tag" "$highest_tag" || cmp_status=$? + [[ $cmp_status -eq 1 ]] && highest_tag="$tag" + done < <(git tag --list) - [[ -z $highest_tag ]] && highest_tag="0.0.1" + [[ -z $highest_tag ]] && highest_tag="0.0.1" - parse_full_version "$highest_tag" - local channel_to_write="$CHANNEL" - local n_to_write="${PRERELEASE_NUM:-1}" - if [[ $channel_to_write == "stable" || -z $channel_to_write ]]; then - channel_to_write="stable" - n_to_write="0" - fi + parse_full_version "$highest_tag" + local channel_to_write="$CHANNEL" + local n_to_write="${PRERELEASE_NUM:-1}" + if [[ $channel_to_write == "stable" || -z $channel_to_write ]]; then + channel_to_write="stable" + n_to_write="0" + fi - printf '%s\n%s\n%s\n' "$BASE_VERSION" "$channel_to_write" "$n_to_write" > "$ROOT_DIR/VERSION" - log "Initialized $ROOT_DIR/VERSION from highest tag: v$highest_tag" + printf '%s\n%s\n%s\n' "$BASE_VERSION" "$channel_to_write" "$n_to_write" >"$ROOT_DIR/VERSION" + log "Initialized $ROOT_DIR/VERSION from highest tag: v$highest_tag" } do_read_version() { - local base_line channel_line n_line - base_line="$(sed -n '1p' "$ROOT_DIR/VERSION" | tr -d '\r')" - channel_line="$(sed -n '2p' "$ROOT_DIR/VERSION" | tr -d '\r')" - n_line="$(sed -n '3p' "$ROOT_DIR/VERSION" | tr -d '\r')" + local base_line channel_line n_line + base_line="$(sed -n '1p' "$ROOT_DIR/VERSION" | tr -d '\r')" + channel_line="$(sed -n '2p' "$ROOT_DIR/VERSION" | tr -d '\r')" + n_line="$(sed -n '3p' "$ROOT_DIR/VERSION" | tr -d '\r')" - if [[ -z $channel_line || $channel_line == "stable" ]]; then - printf '%s\n' "$base_line" - else - printf '%s-%s.%s\n' "$base_line" "$channel_line" "$n_line" - fi + if [[ -z $channel_line || $channel_line == "stable" ]]; then + printf '%s\n' "$base_line" + else + printf '%s-%s.%s\n' "$base_line" "$channel_line" "$n_line" + fi } do_write_version() { - local channel_to_write="$CHANNEL" - local n_to_write="${PRERELEASE_NUM:-1}" - if [[ $channel_to_write == "stable" || -z $channel_to_write ]]; then - channel_to_write="stable" - n_to_write="0" - fi - printf '%s\n%s\n%s\n' "$BASE_VERSION" "$channel_to_write" "$n_to_write" > "$ROOT_DIR/VERSION" + local channel_to_write="$CHANNEL" + local n_to_write="${PRERELEASE_NUM:-1}" + if [[ $channel_to_write == "stable" || -z $channel_to_write ]]; then + channel_to_write="stable" + n_to_write="0" + fi + printf '%s\n%s\n%s\n' "$BASE_VERSION" "$channel_to_write" "$n_to_write" >"$ROOT_DIR/VERSION" } # ── user-provided hook ───────────────────────────────────────────────────── do_post_version() { - : - __POST_VERSION__ + : + __POST_VERSION__ } # ── main ─────────────────────────────────────────────────────────────────── main() { - [[ ${1-} == "-h" || ${1-} == "--help" ]] && usage && exit 0 + [[ ${1-} == "-h" || ${1-} == "--help" ]] && usage && exit 0 - require_clean_git - START_HEAD="$(git rev-parse HEAD)" - trap revert_on_failure ERR + require_clean_git + START_HEAD="$(git rev-parse HEAD)" + trap revert_on_failure ERR - # Initialize VERSION file outside any subshell so log lines never - # bleed into the stdout capture below. - init_version_file + # Initialize VERSION file outside any subshell so log lines never + # bleed into the stdout capture below. + init_version_file - local raw_version - raw_version="$(do_read_version | grep -E '^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z]+\.[0-9]+)?$' | tail -n1)" - if [[ -z $raw_version ]]; then - echo "Error: could not determine current version from VERSION source" >&2 - exit 1 - fi - parse_full_version "$raw_version" + local raw_version + raw_version="$(do_read_version | grep -E '^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z]+\.[0-9]+)?$' | tail -n1)" + if [[ -z $raw_version ]]; then + echo "Error: could not determine current version from VERSION source" >&2 + exit 1 + fi + parse_full_version "$raw_version" - log "Current: base=$BASE_VERSION channel=$CHANNEL pre=${PRERELEASE_NUM:-}" + log "Current: base=$BASE_VERSION channel=$CHANNEL pre=${PRERELEASE_NUM:-}" - local action="${1-}" - shift || true + local action="${1-}" + shift || true - if [[ $action == "set" ]]; then - local newv="${1-}" - [[ -z $newv ]] && echo "Error: 'set' requires a version argument" >&2 && exit 1 - compute_full_version - local current_full="$FULL_VERSION" - parse_full_version "$newv" - validate_channel "$CHANNEL" - compute_full_version - local cmp_status=0 - version_cmp "$FULL_VERSION" "$current_full" || cmp_status=$? - case $cmp_status in - 0) - echo "Version $FULL_VERSION is already current; nothing to do." >&2 - exit 1 - ;; - 2) - echo "Error: $FULL_VERSION is lower than current $current_full" >&2 - exit 1 - ;; - esac + if [[ $action == "set" ]]; then + local newv="${1-}" + [[ -z $newv ]] && echo "Error: 'set' requires a version argument" >&2 && exit 1 + compute_full_version + local current_full="$FULL_VERSION" + parse_full_version "$newv" + validate_channel "$CHANNEL" + compute_full_version + local cmp_status=0 + version_cmp "$FULL_VERSION" "$current_full" || cmp_status=$? + case $cmp_status in + 0) + echo "Version $FULL_VERSION is already current; nothing to do." >&2 + exit 1 + ;; + 2) + echo "Error: $FULL_VERSION is lower than current $current_full" >&2 + exit 1 + ;; + esac - else - local part="" target_channel="" + else + local part="" target_channel="" - case "$action" in - "") part="patch" ;; - major | minor | patch) - part="$action" - target_channel="${1-}" - ;; - stable | full) - [[ -n ${1-} ]] && echo "Error: '$action' takes no second argument" >&2 && usage && exit 1 - target_channel="stable" - ;; - *) - # check if action is a valid channel - local is_channel=0 - for c in __CHANNEL_LIST__; do - [[ $action == "$c" ]] && is_channel=1 && break - done - if [[ $is_channel == 1 ]]; then - [[ -n ${1-} ]] && echo "Error: channel-only bump takes no second argument" >&2 && usage && exit 1 - target_channel="$action" - else - echo "Error: unknown argument '$action'" >&2 - usage - exit 1 - fi - ;; - esac + case "$action" in + "") part="patch" ;; + major | minor | patch) + part="$action" + target_channel="${1-}" + ;; + stable | full) + [[ -n ${1-} ]] && echo "Error: '$action' takes no second argument" >&2 && usage && exit 1 + target_channel="stable" + ;; + *) + # check if action is a valid channel + local is_channel=0 + for c in __CHANNEL_LIST__; do + [[ $action == "$c" ]] && is_channel=1 && break + done + if [[ $is_channel == 1 ]]; then + [[ -n ${1-} ]] && echo "Error: channel-only bump takes no second argument" >&2 && usage && exit 1 + target_channel="$action" + else + echo "Error: unknown argument '$action'" >&2 + usage + exit 1 + fi + ;; + esac - [[ -z $target_channel ]] && target_channel="$CHANNEL" - [[ $target_channel == "full" ]] && target_channel="stable" - validate_channel "$target_channel" + [[ -z $target_channel ]] && target_channel="$CHANNEL" + [[ $target_channel == "full" ]] && target_channel="stable" + validate_channel "$target_channel" - local old_base="$BASE_VERSION" old_channel="$CHANNEL" old_pre="$PRERELEASE_NUM" - [[ -n $part ]] && bump_base_version "$part" + local old_base="$BASE_VERSION" old_channel="$CHANNEL" old_pre="$PRERELEASE_NUM" + [[ -n $part ]] && bump_base_version "$part" - if [[ $target_channel == "stable" ]]; then - CHANNEL="stable" - PRERELEASE_NUM="" - else - if [[ $BASE_VERSION == "$old_base" && $target_channel == "$old_channel" && -n $old_pre ]]; then - PRERELEASE_NUM=$((old_pre + 1)) - else - PRERELEASE_NUM=1 - fi - CHANNEL="$target_channel" - fi - fi + if [[ $target_channel == "stable" ]]; then + CHANNEL="stable" + PRERELEASE_NUM="" + else + if [[ $BASE_VERSION == "$old_base" && $target_channel == "$old_channel" && -n $old_pre ]]; then + PRERELEASE_NUM=$((old_pre + 1)) + else + PRERELEASE_NUM=1 + fi + CHANNEL="$target_channel" + fi + fi - compute_full_version - log "Releasing $FULL_VERSION" + compute_full_version + log "Releasing $FULL_VERSION" - do_write_version - log "Updated version source" + do_write_version + log "Updated version source" - generate_version_files + run_release_steps + log "Release steps done" - do_post_version - log "Post-version hook done" + do_post_version + log "Post-version hook done" - (cd "$ROOT_DIR" && nix fmt) - log "Formatted files" + (cd "$ROOT_DIR" && nix fmt) + log "Formatted files" - git add -A - local commit_msg="chore(release): v$FULL_VERSION" - validate_commit_message "$commit_msg" - git commit -m "$commit_msg" - log "Created commit" + git add -A + local commit_msg="chore(release): v$FULL_VERSION" + validate_commit_message "$commit_msg" + git commit -m "$commit_msg" + log "Created commit" - git tag "v$FULL_VERSION" - CREATED_TAG="v$FULL_VERSION" - log "Tagged v$FULL_VERSION" + git tag "$FULL_TAG" + CREATED_TAG="$FULL_TAG" + log "Tagged $FULL_TAG" - git push - git push --tags - log "Done — released v$FULL_VERSION" + git push + git push --tags + log "Done — released $FULL_TAG" - trap - ERR + trap - ERR } -main "$@" \ No newline at end of file +main "$@"