fix: enhance logging structure by adding missing log event types and improving error handling in API
This commit is contained in:
@@ -78,6 +78,37 @@ jobs:
|
||||
fi
|
||||
echo "pkg_name=$PKG_NAME" >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: Compute versions
|
||||
id: version_meta
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
CARGO_VER="$(python3 - << 'PY'
|
||||
import re
|
||||
txt = open("Cargo.toml", "r", encoding="utf-8").read()
|
||||
m = re.search(r'(?m)^\s*version\s*=\s*"([^"]+)"\s*$', txt)
|
||||
print(m.group(1) if m else "")
|
||||
PY
|
||||
)"
|
||||
if [ -z "$CARGO_VER" ]; then
|
||||
echo "Could not read version from Cargo.toml"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
REF="${GITHUB_REF_NAME:-}"
|
||||
SHA="${GITHUB_SHA:-}"
|
||||
SHORT_SHA="${SHA:0:8}"
|
||||
|
||||
if [[ "$REF" == v* ]]; then
|
||||
PKG_VERSION="${REF#v}"
|
||||
else
|
||||
PKG_VERSION="${CARGO_VER}+g${SHORT_SHA}"
|
||||
fi
|
||||
|
||||
echo "cargo_version=$CARGO_VER" >> "$GITHUB_OUTPUT"
|
||||
echo "pkg_version=$PKG_VERSION" >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: Create source tarball (code)
|
||||
shell: bash
|
||||
run: |
|
||||
@@ -89,8 +120,7 @@ jobs:
|
||||
fi
|
||||
OWNER="${FULL%%/*}"
|
||||
REPO="${FULL##*/}"
|
||||
VERSION="${GITHUB_REF_NAME#v}"
|
||||
PKG_VERSION="${VERSION}"
|
||||
PKG_VERSION="${{ steps.version_meta.outputs.pkg_version }}"
|
||||
BIN_NAME="${{ steps.pkg_meta.outputs.pkg_name }}"
|
||||
|
||||
mkdir -p dist
|
||||
@@ -119,8 +149,7 @@ jobs:
|
||||
exit 1
|
||||
fi
|
||||
REPO="${FULL##*/}"
|
||||
VERSION="${GITHUB_REF_NAME#v}"
|
||||
PKG_VERSION="${VERSION}"
|
||||
PKG_VERSION="${{ steps.version_meta.outputs.pkg_version }}"
|
||||
BIN_NAME="${{ steps.pkg_meta.outputs.pkg_name }}"
|
||||
|
||||
mkdir -p dist
|
||||
@@ -143,8 +172,7 @@ jobs:
|
||||
fi
|
||||
OWNER="${FULL%%/*}"
|
||||
REPO="${FULL##*/}"
|
||||
VERSION="${GITHUB_REF_NAME#v}"
|
||||
PKG_VERSION="${VERSION}"
|
||||
PKG_VERSION="${{ steps.version_meta.outputs.pkg_version }}"
|
||||
BIN_NAME="${{ steps.pkg_meta.outputs.pkg_name }}"
|
||||
|
||||
if [ -z "${BASE_URL:-}" ]; then
|
||||
|
||||
Reference in New Issue
Block a user