From 5485878e6f511f954d50523442198ee5c712decc Mon Sep 17 00:00:00 2001 From: boomzero Date: Sat, 8 Feb 2025 08:41:42 +0800 Subject: [PATCH 1/7] long overdue --- Update/UpdateVersion.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Update/UpdateVersion.js b/Update/UpdateVersion.js index 1992a556..1fab8e5e 100644 --- a/Update/UpdateVersion.js +++ b/Update/UpdateVersion.js @@ -14,6 +14,12 @@ var JSFileContent = readFileSync(JSFileName, "utf8"); execSync("git config --global user.email \"github-actions[bot]@users.noreply.github.com\""); execSync("git config --global user.name \"github-actions[bot]\""); if (JSONFileContent.includes('//!ci-no-touch')) { + var updatedContent = JSONFileContent.replace('//!ci-no-touch', ''); + writeFileSync(JSONFileName, updatedContent, "utf8"); + execSync("git config pull.rebase false"); + execSync("git pull"); + execSync("git commit -a -m \"remove //!ci-no-touch\""); + execSync("git push -f"); console.log('I won\'t touch this. Exiting process.'); process.exit(0); } From 17c711b054161f842a528c869904b2ce63838d40 Mon Sep 17 00:00:00 2001 From: boomzero Date: Sat, 8 Feb 2025 08:44:36 +0800 Subject: [PATCH 2/7] change the versioning strategy --- Update/UpdateToRelease.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Update/UpdateToRelease.js b/Update/UpdateToRelease.js index 8e651fe3..37256782 100644 --- a/Update/UpdateToRelease.js +++ b/Update/UpdateToRelease.js @@ -58,7 +58,7 @@ if (LastType == "Release") { if (LastJSVersion != NpmVersion) { console.warn("Assuming you manually ran npm version."); } else { - execSync("npm version patch"); + execSync("npm version minor"); } var CurrentVersion = execSync("jq -r '.version' package.json").toString().trim(); console.log("Current version : " + CurrentVersion); From f9edf030587d9fa8b7f91b87dcfc1642e369ff7c Mon Sep 17 00:00:00 2001 From: Zhu Chenrui Date: Sat, 8 Feb 2025 08:59:04 +0800 Subject: [PATCH 3/7] break rules Signed-off-by: Zhu Chenrui --- Update/UpdateToRelease.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Update/UpdateToRelease.js b/Update/UpdateToRelease.js index 8e651fe3..37256782 100644 --- a/Update/UpdateToRelease.js +++ b/Update/UpdateToRelease.js @@ -58,7 +58,7 @@ if (LastType == "Release") { if (LastJSVersion != NpmVersion) { console.warn("Assuming you manually ran npm version."); } else { - execSync("npm version patch"); + execSync("npm version minor"); } var CurrentVersion = execSync("jq -r '.version' package.json").toString().trim(); console.log("Current version : " + CurrentVersion); From 47021ea812913b84c373e06ee44898ee2b0f106a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 8 Feb 2025 01:06:26 +0000 Subject: [PATCH 4/7] 1.3.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 63778581..f9481ffd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xmoj-script", - "version": "1.2.75", + "version": "1.3.0", "description": "an improvement script for xmoj.tech", "main": "AddonScript.js", "scripts": { From 66246072234a28ba69f90799586b9f691d176dfa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 8 Feb 2025 01:06:27 +0000 Subject: [PATCH 5/7] Update to release 1.3.0 --- Update.json | 15 +++++++++++++++ XMOJ.user.js | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Update.json b/Update.json index 1e4fe654..3d59e8fc 100644 --- a/Update.json +++ b/Update.json @@ -2703,6 +2703,21 @@ } ], "Notes": "No release notes were provided for this release." + }, + "1.3.0": { + "UpdateDate": 1738976786495, + "Prerelease": false, + "UpdateContents": [ + { + "PR": 762, + "Description": "讨论回复跳转优化" + }, + { + "PR": 767, + "Description": "进入讨论后给出题目的链接 " + } + ], + "Notes": "No release notes were provided for this release." } } } \ No newline at end of file diff --git a/XMOJ.user.js b/XMOJ.user.js index 28ac1222..5e0378a5 100644 --- a/XMOJ.user.js +++ b/XMOJ.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name XMOJ -// @version 1.2.75 +// @version 1.3.0 // @description XMOJ增强脚本 // @author @XMOJ-Script-dev, @langningchen and the community // @namespace https://github/langningchen From 7f9911510117253be275508fa3d1597b37761c12 Mon Sep 17 00:00:00 2001 From: boomzero Date: Sat, 8 Feb 2025 09:13:26 +0800 Subject: [PATCH 6/7] rel notes --- Update.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Update.json b/Update.json index 3d59e8fc..05ebb9be 100644 --- a/Update.json +++ b/Update.json @@ -2717,7 +2717,7 @@ "Description": "进入讨论后给出题目的链接 " } ], - "Notes": "No release notes were provided for this release." + "Notes": "If you are curious why the version number is v1.3.0, it's because we changed our versioning strategy! Click here for more details."//!ci-no-touch } } } \ No newline at end of file From 654801c350bb3f3773a7dce7d5289debae35267e Mon Sep 17 00:00:00 2001 From: boomzero Date: Sat, 8 Feb 2025 09:15:23 +0800 Subject: [PATCH 7/7] emm... --- Update.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Update.json b/Update.json index 05ebb9be..6fbb2c7b 100644 --- a/Update.json +++ b/Update.json @@ -2717,7 +2717,7 @@ "Description": "进入讨论后给出题目的链接 " } ], - "Notes": "If you are curious why the version number is v1.3.0, it's because we changed our versioning strategy! Click here for more details."//!ci-no-touch + "Notes": "If you are curious why the version number is v1.3.0, it's because we changed our versioning strategy! Click here for more details." } } } \ No newline at end of file