From 0be4ac1fa5412c3810e33ad325e4efb9e9dc4c57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E5=98=89=E4=B9=90?= Date: Thu, 25 Dec 2025 20:42:43 +0800 Subject: [PATCH] =?UTF-8?q?[Ohos]=20=E4=BD=BF=E7=94=A8Commit=E8=AE=A1?= =?UTF-8?q?=E6=95=B0=E5=99=A8=E6=9B=BF=E4=BB=A3Commit=20Hash=E4=BD=9C?= =?UTF-8?q?=E4=B8=BA=E7=89=88=E6=9C=AC=E5=B0=BE=E7=BC=80=20(#1703)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ohos.yml | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ohos.yml b/.github/workflows/ohos.yml index 054165c9..246e6c4a 100644 --- a/.github/workflows/ohos.yml +++ b/.github/workflows/ohos.yml @@ -59,12 +59,32 @@ jobs: pkg-config curl libgl1-mesa-dev expect sudo apt-get clean + - name: Count commits since last tag on upstream main + run: | + UPSTREAM_REPO="https://github.com/EasyTier/EasyTier.git" + + git remote add upstream "$UPSTREAM_REPO" 2>/dev/null || true + git fetch upstream --tags --force + + # 获取 upstream/main 最新提交 + git fetch upstream main + + LAST_TAG=$(git describe --tags --abbrev=0 upstream/main 2>/dev/null || echo "") + + if [ -z "$LAST_TAG" ]; then + DIFF_COUNT=$(git rev-list --count upstream/main) + else + DIFF_COUNT=$(git rev-list --count "${LAST_TAG}..upstream/main") + fi + + echo "TAG_COMMIT_DIFF=$DIFF_COUNT" + echo "TAG_COMMIT_DIFF=$DIFF_COUNT" >> $GITHUB_ENV + - name: Get easytier version run: | EASYTIER_CARGO_VERSION=$(cargo metadata --format-version 1 --no-deps --manifest-path easytier/Cargo.toml \ | jq -r '.packages[0].version') - EASYTIER_GIT_HASH=$(git -C easytier rev-parse --short HEAD) - EASYTIER_VERSION="${EASYTIER_CARGO_VERSION}-${EASYTIER_GIT_HASH}" + EASYTIER_VERSION="${EASYTIER_CARGO_VERSION}-${TAG_COMMIT_DIFF}" echo "EASYTIER_VERSION=${EASYTIER_VERSION}" >> $GITHUB_ENV cd ./easytier-contrib/easytier-ohrs/package jq --arg v "$EASYTIER_VERSION" '.version = $v' oh-package.json5 > oh-package.tmp.json5