From 7ba60b22c571fa635a782484233e593f9507fddc 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:06:07 +0800 Subject: [PATCH 1/5] fix --- script/checkVersion.cjs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/script/checkVersion.cjs b/script/checkVersion.cjs index 4f1fac9e..6f0cb430 100644 --- a/script/checkVersion.cjs +++ b/script/checkVersion.cjs @@ -6,10 +6,10 @@ let targetVersion = process.env.VERSION; console.log("[NapCat] [CheckVersion] currentVersion:", currentVersion, " targetVersion:", targetVersion); // fs.mkdirSync("./dist"); if (currentVersion === targetVersion) { - fs.writeFileSync("../checkVersion.sh", "#!/bin/bashe\necho \"CheckVersion Is Done\"") + fs.writeFileSync("./checkVersion.sh", "#!/bin/bashe\necho \"CheckVersion Is Done\"") } else { - let packageJson = JSON.parse(fs.readFileSync("../package.json")); + 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") + 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") } From 85792763813da3b867727a18c82005272ee78872 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:10:07 +0800 Subject: [PATCH 2/5] fix --- script/checkVersion.cjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/checkVersion.cjs b/script/checkVersion.cjs index 6f0cb430..185a87eb 100644 --- a/script/checkVersion.cjs +++ b/script/checkVersion.cjs @@ -11,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") + 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") } From 4fb5700367c284c5f08b4a7b599f33b8216adef4 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:12:33 +0800 Subject: [PATCH 3/5] fix --- script/checkVersion.cjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/checkVersion.cjs b/script/checkVersion.cjs index 185a87eb..240c229b 100644 --- a/script/checkVersion.cjs +++ b/script/checkVersion.cjs @@ -11,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 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") + 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 origin main") } From 6af4d6f5b8820fe3ba62c85752ad383724961f06 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:14:09 +0800 Subject: [PATCH 4/5] fix --- script/checkVersion.cjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/checkVersion.cjs b/script/checkVersion.cjs index 240c229b..29de7882 100644 --- a/script/checkVersion.cjs +++ b/script/checkVersion.cjs @@ -11,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 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 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") } From 02299e3892e3faa3ee965222e6fef46fb387b129 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:17:30 +0800 Subject: [PATCH 5/5] fix --- script/checkVersion.cjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/checkVersion.cjs b/script/checkVersion.cjs index 29de7882..331932a8 100644 --- a/script/checkVersion.cjs +++ b/script/checkVersion.cjs @@ -11,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 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") + fs.writeFileSync("./checkVersion.sh", "#!/bin/bashe\ngit config --global user.email \"bot@test.mail\"\n git config --global user.name \"Version\"\ngit branch -M main\ngit add .\n git commit -m \"chore:version change\"\n git push -u origin main") }