Sync Dev

.github/workflows/sitemap-automation.yml

@@ -16,7 +16,7 @@ jobs:
         fetch-depth: 0
     - name: Generate new sitemap
       id: sitemap
-      uses: cicirello/generate-sitemap@v1.6.1
+      uses: cicirello/generate-sitemap@v1.10.0
       with:
         additional-extensions: user.js
         sitemap-format: xml

Update.json

@@ -1265,6 +1265,50 @@
                 }
             ],
             "Notes": "No release notes were provided for this release."
+        },
+        "1.1.42": {
+            "UpdateDate": 1707642572244,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 445,
+                    "Description": "fix  [Bug] 右上角用户名点击后无反应 "
+                }
+            ],
+            "Notes": "Popper.js is so stupid..."
+        },
+        "1.1.43": {
+            "UpdateDate": 1707715028113,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 447,
+                    "Description": "fix the unpkg-cdn option"
+                }
+            ],
+            "Notes": "No release notes were provided for this release."
+        },
+        "1.1.44": {
+            "UpdateDate": 1707803296933,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 449,
+                    "Description": "regression!"
+                }
+            ],
+            "Notes": "No release notes were provided for this release."
+        },
+        "1.1.45": {
+            "UpdateDate": 1708070431275,
+            "Prerelease": true,
+            "UpdateContents": [
+                {
+                    "PR": 454,
+                    "Description": "fix #400 + //ci-no-touch"
+                }
+            ],
+            "Notes": "No release notes were provided for this release."
         }
     }
-}
+}

Update/UpdateToRelease.js

@@ -1,5 +1,5 @@
-import { readFileSync, writeFileSync } from "fs";
-import { execSync } from "child_process";
+import {readFileSync, writeFileSync} from "fs";
+import {execSync} from "child_process";
 
 var GithubToken = process.argv[2];
 var PRNumber = process.argv[3];
@@ -24,13 +24,37 @@ console.log("Last JSON version  : " + LastJSONVersion);
 console.log("Last PR            : " + LastPR);
 console.log("Last type          : " + LastType);
 console.log("npm version        : " + NpmVersion);
+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 push origin --delete actions/temp || true");
+    execSync("git checkout -b actions/temp");
+    execSync("git commit -a -m \"remove //!ci-no-touch\"");
+    execSync("git push -u origin actions/temp -f");
+    console.warn("Pushed to actions/temp.");
+
+    var PRNumber = execSync("gh pr create --title \"Update to release " + CurrentVersion + "\" --body \"Update to release " + CurrentVersion + "\" --base dev --head actions/temp").toString().split("/")[6].trim();
+    console.warn("PR #" + PRNumber + " has been created.");
+
+    execSync("gh pr merge " + PRNumber + " --merge --auto");
+    console.warn("PR #" + PRNumber + " has enabled auto merge.");
+    console.log('I won\'t touch this. Exiting process.');
+    process.exit(0);
+}
 if (LastJSONVersion != LastJSVersion) {
     console.error("XMOJ.user.js and Update.json have different patch versions.");
     process.exit(1);
 }
-
-execSync("git config --global user.email \"github-actions[bot]@users.noreply.github.com\"");
-execSync("git config --global user.name \"github-actions[bot]\"");
+if (LastType == "Release") {
+    console.error("Last release is not a prerelease.");
+    execSync("gh pr comment " + PRNumber + " --body \"请重新提交PR, 谢谢");
+    execSync("gh pr close " + PRNumber);
+    process.exit(1);
+}
 
 if (LastJSVersion != NpmVersion) {
     console.warn("Assuming you manually ran npm version.");

Update/UpdateVersion.js

@@ -1,5 +1,5 @@
-import { readFileSync, writeFileSync } from "fs";
-import { execSync } from "child_process";
+import {readFileSync, writeFileSync} from "fs";
+import {execSync} from "child_process";
 
 var GithubToken = process.argv[2];
 var PRNumber = process.argv[3];
@@ -26,6 +26,19 @@ console.log("Last PR            : " + LastPR);
 console.log("Last description   : " + LastDescription);
 console.log("Last release online: " + LastReleaseVersionOnline);
 console.log("npm version        : " + NpmVersion);
+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("Pushed to GitHub.");
+    console.log('I won\'t touch this. Exiting process.');
+    process.exit(0);
+}
 if (LastJSONVersion != LastJSVersion) {
     console.error("XMOJ.user.js and Update.json have different patch versions.");
     process.exit(1);
@@ -37,7 +50,7 @@ var CurrentPR = Number(PRNumber);
 var CurrentDescription = String(process.argv[4]);
 if (LastJSVersion != NpmVersion) {
     console.warn("Assuming you manually ran npm version.");
-} else if(!(LastPR == CurrentPR && NpmVersion == LastJSVersion)) {
+} else if (!(LastPR == CurrentPR && NpmVersion == LastJSVersion)) {
     execSync("npm version patch");
 }
 
@@ -56,8 +69,7 @@ if (LastPR == CurrentPR && NpmVersion == LastJSVersion) {
     JSONObject.UpdateHistory[LastJSVersion].UpdateDate = Date.now();
     JSONObject.UpdateHistory[LastJSVersion].UpdateContents[0].Description = CurrentDescription;
     CommitMessage = "Update time and description of " + LastJSVersion;
-}
-else if (ChangedFileList.indexOf("XMOJ.user.js") == -1) {
+} else if (ChangedFileList.indexOf("XMOJ.user.js") == -1) {
     console.warn("XMOJ.user.js is not changed, so the version should not be updated.");
     process.exit(0);
 } else {