LLM inference in C/C++
C++ ggml
ci : create pre-release with change log and nightly link in make-release (#27302)
Georgi Gerganov8b86400975fb
diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.ymlindex 9bf289a8c2..78d7caa7ae 100644--- a/.github/workflows/make-release.yml+++ b/.github/workflows/make-release.yml@@ -49,6 +49,33 @@ jobs:git push origin "${VERSION}"echo "Created and pushed tag ${VERSION}"+ - name: Generate release description+ id: desc+ run: bash scripts/make-release-desc.sh "${{ steps.checks.outputs.version }}"+ env:+ GITHUB_REPOSITORY: ${{ github.repository }}++ - name: Create release+ if: ${{ github.event.inputs.dry_run == 'false' }}+ uses: ggml-org/action-create-release@v1+ env:+ GITHUB_TOKEN: ${{ github.token }}+ with:+ tag_name: ${{ steps.checks.outputs.version }}+ # TODO: remove the prerelease flag once the semantic versioning workflow is ready+ # ref: https://github.com/ggml-org/ggml/discussions/1579+ prerelease: true+ body: |+ > [!NOTE]+ > Semantic versioning is still work in progress.+ > More info can be found in https://github.com/ggml-org/ggml/discussions/1579++ ${{ steps.desc.outputs.nightly }}++ ## ${{ steps.desc.outputs.changelog_title }}++ ${{ steps.desc.outputs.changelog }}+- name: Dry run summaryif: ${{ github.event.inputs.dry_run == 'true' }}run: |diff --git a/CMakeLists.txt b/CMakeLists.txtindex 19f14e0d18..5c443c0dd0 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -5,7 +5,7 @@ include(CheckIncludeFileCXX)### llama.cpp versionset(LLAMA_VERSION_MAJOR 0)set(LLAMA_VERSION_MINOR 1)-set(LLAMA_VERSION_PATCH 1)+set(LLAMA_VERSION_PATCH 2)set(LLAMA_VERSION_BASE "${LLAMA_VERSION_MAJOR}.${LLAMA_VERSION_MINOR}.${LLAMA_VERSION_PATCH}")# whether this is a development/nightly builddiff --git a/scripts/make-release-desc.sh b/scripts/make-release-desc.shnew file mode 100755index 0000000000..100f855b35--- /dev/null+++ b/scripts/make-release-desc.sh@@ -0,0 +1,87 @@+#!/bin/bash+# Generate the description of a release: the previous release version, the+# change log and the link to the nightly release corresponding to the commit being released.+#+# Usage: make-release-desc.sh <version>+# <version>: current release version (v<maj>.<min>.<pat>, the leading v is optional)+#+# The previous version is the highest plain semver tag (v<maj>.<min>.<pat>)+# strictly below <version>. The change log lists all commits between the+# previous version tag and the release commit, one line per commit.+#+# The release commit is the commit <version> points at when the tag exists,+# HEAD otherwise. The nightly release is the b* tag pointing at that commit+# (release.yml tags the same commit); the link is only generated when that+# tag exists.+#+# Env (when running in GitHub Actions):+# GITHUB_OUTPUT: previous_tag, changelog_title, changelog and nightly are written here+# GITHUB_REPOSITORY: owner/repo, used to build the nightly release URL (skipped when unset)+set -euo pipefail++if [[ $# -ne 1 ]]; then+ echo "Usage: $(basename "$0") <version>"+ exit 1+fi+VERSION="$1"++# Accept the version with or without the leading v, reject anything else+if [[ "${VERSION}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then+ VERSION="v${VERSION}"+elif [[ ! "${VERSION}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then+ echo "Error: invalid version '${VERSION}' (expected v<maj>.<min>.<pat>)"+ exit 1+fi++# Make sure all remote tags are available locally (skipped on local runs without origin)+if ! git fetch --tags origin 2>/dev/null; then+ echo "Warning: could not fetch tags from origin (local run?)"+fi++# Release commit: the commit <version> points at when the tag exists, HEAD otherwise.+if ! RELEASE_COMMIT="$(git rev-parse -q --verify "refs/tags/${VERSION}^{commit}" 2>/dev/null)"; then+ RELEASE_COMMIT="$(git rev-parse HEAD)"+fi++echo "Release commit: $(git rev-parse --short "${RELEASE_COMMIT}")"++PREV="$( { git tag --list; echo "${VERSION}"; } \+ | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' \+ | sort -V \+ | awk -v cur="${VERSION}" '$0 == cur { exit } { prev = $0 } END { print prev }')"++if [[ -n "${PREV}" ]]; then+ CHANGELOG="$(git log --oneline "${PREV}..${RELEASE_COMMIT}")"+ CHANGELOG_TITLE="Change log since ${PREV}"+else+ CHANGELOG="(no previous release tag found)"+ CHANGELOG_TITLE="Change log"+fi++# Nightly release: the b* tag pointing at the release commit (|| true: no match is not an error)+NIGHTLY_TAG="$(git tag --points-at "${RELEASE_COMMIT}" | grep -E '(^|-)b[0-9]+(-[0-9a-f]{7})?$' | head -n 1 || true)"++NIGHTLY=""+if [[ -n "${NIGHTLY_TAG}" ]]; then+ if [[ -n "${GITHUB_REPOSITORY:-}" ]]; then+ NIGHTLY_URL="https://github.com/${GITHUB_REPOSITORY}/releases/tag/${NIGHTLY_TAG}"+ NIGHTLY="**Nightly build:** [${NIGHTLY_TAG}](${NIGHTLY_URL})"+ echo "Nightly release: ${NIGHTLY_URL}"+ fi+else+ echo "No nightly release found for commit $(git rev-parse --short "${RELEASE_COMMIT}")"+fi++echo "Previous version: ${PREV:-none}"+echo "${CHANGELOG}"++if [[ -n "${GITHUB_OUTPUT:-}" ]]; then+ {+ echo "previous_tag=${PREV}"+ echo "changelog_title=${CHANGELOG_TITLE}"+ echo "nightly=${NIGHTLY}"+ echo "changelog<<CHANGELOG_EOF"+ echo "${CHANGELOG}"+ echo "CHANGELOG_EOF"+ } >> "${GITHUB_OUTPUT}"+fi