From f9af54b4a9b9505ae792daf666fd09b2008fc48c Mon Sep 17 00:00:00 2001 From: pooneyy <85266337+pooneyy@users.noreply.github.com> Date: Sat, 4 Oct 2025 09:44:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=94=A7=20chore(renovate):=20update=20?= =?UTF-8?q?renovate=20configuration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - add pooneyy as required reviewer for dependency updates - add pooneyy's noreply email to git ignored authors list - enable automerge for dependency updates using PR method --- renovate.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 6d0ff1fb7..69487e486 100644 --- a/renovate.json +++ b/renovate.json @@ -3,9 +3,14 @@ "extends": [ "config:recommended" ], + "reviewers": ["pooneyy"], "gitIgnoredAuthors": [ - "githubaction@githubaction.com" + "githubaction@githubaction.com", + "85266337+pooneyy@users.noreply.github.com" ], + "automerge": true, + "automergeType": "pr", + "automergeStrategy": "squash", "rebaseWhen": "never", "prConcurrentLimit":0, "packageRules": [ From 4a30cf5fc8c4247bd6722629646c420759ac9256 Mon Sep 17 00:00:00 2001 From: pooneyy <85266337+pooneyy@users.noreply.github.com> Date: Sat, 4 Oct 2025 09:45:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=94=A7=20chore(workflows):=20update?= =?UTF-8?q?=20github=20actions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - migrate from deprecated ::set-output to $GITHUB_OUTPUT syntax - improve commit messages with app name and version details - enhance commit message formatting with emoji and detailed version info --- .github/workflows/renovate-app-version.sh | 1 + .github/workflows/renovate-app-version.yml | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/renovate-app-version.sh b/.github/workflows/renovate-app-version.sh index 495762e8f..4c396102a 100644 --- a/.github/workflows/renovate-app-version.sh +++ b/.github/workflows/renovate-app-version.sh @@ -28,6 +28,7 @@ do echo "将 apps/$app_name/$old_version 重命名为 apps/$app_name/$trimmed_version" if [ ! -d "apps/$app_name/$trimmed_version" ]; then mv apps/$app_name/$old_version apps/$app_name/$trimmed_version + echo "$trimmed_version" > apps/$app_name/${old_version}.version else echo "apps/$app_name/$trimmed_version 文件夹已存在" exit 1 diff --git a/.github/workflows/renovate-app-version.yml b/.github/workflows/renovate-app-version.yml index 643f9c888..243d02057 100644 --- a/.github/workflows/renovate-app-version.yml +++ b/.github/workflows/renovate-app-version.yml @@ -27,7 +27,7 @@ jobs: - name: Get list of updated files by the last commit in this branch separated by space id: updated-files run: | - echo "::set-output name=files::$(git diff-tree --no-commit-id --name-only -r ${{ github.sha }} | tr '\n' ' ')" + echo "files=$(git diff-tree --no-commit-id --name-only -r ${{ github.sha }} | tr '\n' ' ')" >> $GITHUB_OUTPUT - name: Run renovate-app-version.sh on updated files run: | @@ -49,6 +49,9 @@ jobs: for file in "${files[@]}"; do if [[ $file == *"docker-compose.yml"* ]]; then app_name=$(echo $file | cut -d'/' -f 2) - git add "apps/$app_name/*" && git commit -m "Update app version [skip ci]" --no-verify && git push || true + old_version=$(echo $file | cut -d'/' -f 3) + new_version=$(cat "apps/$app_name/${old_version}.version") + rm -f "apps/$app_name/${old_version}.version" + git add "apps/$app_name/*" && git commit -m "🔧 chore($app_name): update app version from $old_version to $new_version [skip ci]" --no-verify && git push || true fi done \ No newline at end of file