From 404475051553666d76c1424bbca3df8648367d61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Tue, 16 Apr 2024 13:42:22 +0800 Subject: [PATCH] fix --- .github/workflows/release.yml | 24 +++++++++--------------- script/checkVersion.cjs | 3 +-- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 78ae6241..f2cdda0f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,14 +11,11 @@ jobs: check-version: runs-on: ubuntu-latest steps: - - name: Clone - run: | - GITHUB_URL=https://oauth:${{ secrets.NAPCAT_BUILD }}@github.com//NapNeko/NapCatQQ - git clone --recurse-submodules ${GITHUB_URL} NapCatQQ - git config --global init.defaultBranch main - git config --global user.name "CheckVersion" - git config --global user.email "bot@noreply.github.com" - + - name: Clone Repository + uses: actions/checkout@v4 + with: + ref: main + token: ${{ secrets.GITHUB_TOKEN }} - name: Extract version from tag run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV @@ -28,14 +25,11 @@ jobs: with: node-version: 20.x - - name: Clone Check Version + - name: Check Version run: | - cd ./NapCatQQ - node ./script/checkVersion.cjs - sh ./checkVersion.cjs - cd .. - - + ls + node ./script/checkVersion.cjs + sh ./checkVersion.sh build-linux: needs: [check-version] runs-on: ubuntu-latest diff --git a/script/checkVersion.cjs b/script/checkVersion.cjs index 9ecbaf82..29de7882 100644 --- a/script/checkVersion.cjs +++ b/script/checkVersion.cjs @@ -1,7 +1,6 @@ let fs = require("fs"); let process = require("process") console.log("[NapCat] [CheckVersion] 开始检测当前仓库版本..."); - let currentVersion = require("../package.json").version; let targetVersion = process.env.VERSION; console.log("[NapCat] [CheckVersion] currentVersion:", currentVersion, " targetVersion:", targetVersion); @@ -12,5 +11,5 @@ if (currentVersion === targetVersion) { let packageJson = JSON.parse(fs.readFileSync("./package.json")); packageJson.version = targetVersion; fs.writeFileSync("./package.json", JSON.stringify(packageJson)); - fs.writeFileSync("./checkVersion.sh", "#!/bin/bashe\ngit add .\n git commit -m \"chore:version change\"\n git push -u origin main") + fs.writeFileSync("./checkVersion.sh", "#!/bin/bashe\ngit config --global user.email \"bot@test.mail\"\n git config --global user.name \"Version\"\ngit add .\n git commit -m \"chore:version change\"\n git push -u origin main") }