diff --git a/.gitea/workflows/deb.yml b/.gitea/workflows/deb.yml index 6e99620..02bbeff 100644 --- a/.gitea/workflows/deb.yml +++ b/.gitea/workflows/deb.yml @@ -60,9 +60,10 @@ jobs: # BEFORE 0.0.1 (the '~') yet monotonically increases by run number, so `apt upgrade` # always moves the boxes to the newest main build. run: | + SHORT=$(echo "$GITHUB_SHA" | cut -c1-8) case "$GITHUB_REF" in refs/tags/v*) V="${GITHUB_REF_NAME#v}" ;; - *) V="0.0.1~ci${GITHUB_RUN_NUMBER}.g${GITHUB_SHA::8}" ;; + *) V="0.0.1~ci${GITHUB_RUN_NUMBER}.g${SHORT}" ;; esac echo "VERSION=$V" >> "$GITHUB_ENV" echo "package version $V" diff --git a/.gitea/workflows/rpm.yml b/.gitea/workflows/rpm.yml index 7773efc..2c769a6 100644 --- a/.gitea/workflows/rpm.yml +++ b/.gitea/workflows/rpm.yml @@ -46,9 +46,10 @@ jobs: # sorts BEFORE the eventual "1" yet increases by run number, so `rpm-ostree upgrade` # always moves to the newest main build. run: | + SHORT=$(echo "$GITHUB_SHA" | cut -c1-8) case "$GITHUB_REF" in refs/tags/v*) V="${GITHUB_REF_NAME#v}"; R="1" ;; - *) V="0.0.1"; R="0.ci${GITHUB_RUN_NUMBER}.g${GITHUB_SHA::8}" ;; + *) V="0.0.1"; R="0.ci${GITHUB_RUN_NUMBER}.g${SHORT}" ;; esac echo "PF_VERSION=$V" >> "$GITHUB_ENV" echo "PF_RELEASE=$R" >> "$GITHUB_ENV"