Merge pull request #1981 from gitgitgadget/more-gitgitgadget-github-actions-prerequisites

dscho · web-flow · commit 6416a6be328a · 2025-08-22T09:22:03.000Z
More prerequisites to move GitGitGadget towards GitHub Actions
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,3 @@
 /obj/**
 /*.sln*
 /*.njsproj*
-/*.tgz
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -1,11 +1,11 @@
-import eslint from "@eslint/js";
-import stylistic from "@stylistic/eslint-plugin";
-import jsdoc from "eslint-plugin-jsdoc";
-import eslintConfigPrettier from "eslint-config-prettier";
-import eslintPluginPrettier from "eslint-plugin-prettier";
-import eslintPluginSecurity from "eslint-plugin-security";
-import globals from "globals";
-import tseslint from "typescript-eslint";
+import eslint from "@eslint/js"
+import stylistic from "@stylistic/eslint-plugin"
+import jsdoc from "eslint-plugin-jsdoc"
+import eslintConfigPrettier from "eslint-config-prettier"
+import eslintPluginPrettier from "eslint-plugin-prettier"
+import eslintPluginSecurity from "eslint-plugin-security"
+import globals from "globals"
+import tseslint from "typescript-eslint"
 
 export default tseslint.config(
   {
@@ -127,6 +127,18 @@ export default tseslint.config(
       "security/detect-object-injection": "off",
     },
   },
+  {
+    files: ["**/*.js", "**/*.mjs"],
+    rules: {
+      "@stylistic/semi": ["error", "never"],
+      "prettier/prettier": [
+        "warn",
+        {
+          semi: false,
+        },
+      ],
+    },
+  },
   {
     files: ["tests/*.ts", "lib/*.ts", "script/*.ts"],
     extends: [...tseslint.configs.recommendedTypeChecked],
@@ -181,4 +193,4 @@ export default tseslint.config(
     },
   },
   // eslintPluginPrettierRecommended,
-);
+)
diff --git a/lib/ci-helper.ts b/lib/ci-helper.ts
@@ -524,7 +524,7 @@ export class CIHelper {
             const prKey = getPullRequestKeyFromURL(prMeta.pullRequestURL);
             const fetchURL = `https://github.com/${prKey.owner}/${prKey.repo}`;
             const fetchRef = `refs/pull/${prKey.pull_number}/head`;
-            await git(["fetch", fetchURL, fetchRef, prMeta.latestTag], {
+            await git(["fetch", "--no-tags", fetchURL, fetchRef, prMeta.latestTag], {
                 workDir: this.workDir,
             });
         }
diff --git a/lib/git-notes.ts b/lib/git-notes.ts
@@ -39,7 +39,7 @@ export class GitNotes {
                 // wait a while before trying again to push (after fetching the remote notes ref and merging it)
                 await sleep(backoff);
 
-                const output = await git(["fetch", "--porcelain", url, "--", `${this.notesRef}`], {
+                const output = await git(["fetch", "--porcelain", "--no-tags", url, "--", `${this.notesRef}`], {
                     workDir: this.workDir,
                 });
                 // parse the output to obtain the OID of the remote notes ref
@@ -122,7 +122,7 @@ export class GitNotes {
 
     public async update(url: string): Promise<void> {
         if (this.notesRef.match(/^refs\/notes\/(gitgitgadget|commit-to-mail|mail-to-commit)$/)) {
-            await git(["fetch", url, `+${this.notesRef}:${this.notesRef}`], { workDir: this.workDir });
+            await git(["fetch", "--no-tags", url, `+${this.notesRef}:${this.notesRef}`], { workDir: this.workDir });
         } else {
             throw new Error(`Don't know how to update ${this.notesRef}`);
         }
diff --git a/lib/git.ts b/lib/git.ts
@@ -37,10 +37,12 @@ function trimTrailingNewline(str: string): string {
  * @throws {Error} if the command fails
  */
 export function git(args: string[], options?: IGitOptions): Promise<string> {
+    let workDir = (options && options.workDir) || ".";
     // allow the command to run in a bare repository
-    if (options?.workDir?.endsWith(".git")) args = [`--git-dir=${options.workDir}`, ...args];
-
-    const workDir = (options && options.workDir) || ".";
+    if (options?.workDir?.endsWith(".git")) {
+        args = [`--git-dir=${options.workDir}`, ...args];
+        workDir = ".";
+    }
     if (options && options.trace) {
         process.stderr.write(`Called 'git ${args.join(" ")}' in '${workDir}':\n${new Error().stack}\n`);
     }
diff --git a/lib/gitgitgadget.ts b/lib/gitgitgadget.ts
@@ -59,7 +59,13 @@ export class GitGitGadget {
 
         // Always fetch the Git notes first thing
         await git(
-            ["fetch", publishTagsAndNotesToRemote, "--", `+${GitNotes.defaultNotesRef}:${GitNotes.defaultNotesRef}`],
+            [
+                "fetch",
+                "--no-tags",
+                publishTagsAndNotesToRemote,
+                "--",
+                `+${GitNotes.defaultNotesRef}:${GitNotes.defaultNotesRef}`,
+            ],
             { workDir },
         );
 
@@ -215,6 +221,7 @@ export class GitGitGadget {
         const pullRequestMerge = `refs/pull/${pullRequestNumber}/merge`;
         const args = [
             "fetch",
+            "--no-tags",
             this.publishTagsAndNotesToRemote,
             "--",
             `+${this.notes.notesRef}:${this.notes.notesRef}`,
@@ -233,9 +240,12 @@ export class GitGitGadget {
         if (repositoryOwner === this.config.repo.owner) {
             args.push(...prArgs);
         } else {
-            await git(["fetch", `https://github.com/${repositoryOwner}/${this.config.repo.name}`, ...prArgs], {
-                workDir: this.workDir,
-            });
+            await git(
+                ["fetch", "--no-tags", `https://github.com/${repositoryOwner}/${this.config.repo.name}`, ...prArgs],
+                {
+                    workDir: this.workDir,
+                },
+            );
         }
         await git(args, { workDir: this.workDir });
 
@@ -249,6 +259,7 @@ export class GitGitGadget {
         await git(
             [
                 "fetch",
+                "--no-tags",
                 this.publishTagsAndNotesToRemote,
                 "--",
                 `+${GitNotes.defaultNotesRef}:${GitNotes.defaultNotesRef}`,
diff --git a/lib/mail-commit-mapping.ts b/lib/mail-commit-mapping.ts
@@ -43,9 +43,17 @@ export class MailCommitMapping {
         }
         if (refs.length) {
             console.log(`Updating mail-to-commit/refs: ${refs.join(", ")}`);
-            await git(["fetch", `https://github.com/${this.config.repo.owner}/${this.config.repo.name}`, ...refs], {
-                workDir: this.workDir,
-            });
+            await git(
+                [
+                    "fetch",
+                    "--no-tags",
+                    `https://github.com/${this.config.repo.owner}/${this.config.repo.name}`,
+                    ...refs,
+                ],
+                {
+                    workDir: this.workDir,
+                },
+            );
         }
     }
 }
diff --git a/lib/misc-action.ts b/lib/misc-action.ts
diff --git a/lib/pull-action.ts b/lib/pull-action.ts
diff --git a/package.json b/package.json
@@ -25,9 +25,6 @@
     "url": "https://github.com/gitgitgadget/gitgitgadget/issues"
   },
   "homepage": "https://gitgitgadget.github.io/",
-  "files": [
-    "lib/*.ts"
-  ],
   "jest": {
     "extensionsToTreatAsEsm": [
       ".ts"
diff --git a/script/lookup-commit.sh b/script/lookup-commit.sh
@@ -68,15 +68,15 @@ update_gitgit_dir () {
 	git -C "$GITGIT_DIR" fetch $git_remote refs/notes/commit-to-mail:refs/notes/commit-to-mail ||
 	die "Could not update refs/notes/commit-to-mail"
 
-	if git -C "$GITGIT_DIR" rev-parse --verify refs/remotes/gitster/seen >/dev/null 2>&1
+	if git -C "$GITGIT_DIR" rev-parse --verify refs/remotes/upstream/seen >/dev/null 2>&1
 	then
 		# Let's take 'seen' from the official source at git.git.
-		git -C "$GITGIT_DIR" remote set-url gitster https://github.com/git/git
-		git -C "$GITGIT_DIR" fetch gitster ||
-		die "Could not update the 'gitster' remote to $GITGIT_DIR"
+		git -C "$GITGIT_DIR" remote set-url upstream https://github.com/git/git
+		git -C "$GITGIT_DIR" fetch upstream ||
+		die "Could not update the 'upstream' remote to $GITGIT_DIR"
 	else
-		git -C "$GITGIT_DIR" remote add -f gitster https://github.com/git/git ||
-		die "Could not add the 'gitster' remote to $GITGIT_DIR"
+		git -C "$GITGIT_DIR" remote add -f upstream https://github.com/git/git ||
+		die "Could not add the 'upstream' remote to $GITGIT_DIR"
 	fi
 }
 
@@ -182,8 +182,8 @@ test notes != "$mode" || {
 		update_gitgit_dir ||
 		die "Could not update $GITGIT_DIR"
 
-		to="$(git -C "$GITGIT_DIR" rev-parse --verify refs/remotes/gitster/seen)" ||
-		die "Could not determine tip rev of gitster/seen"
+		to="$(git -C "$GITGIT_DIR" rev-parse --verify refs/remotes/upstream/seen)" ||
+		die "Could not determine tip rev of upstream/seen"
 		from="$(git -C "$GITGIT_DIR" show -s --format=%s refs/notes/commit-to-mail^{/Update.from.commit.range} 2>/dev/null | sed -ne 's/"//g' -e 's/^Update from commit range \(.*\.\.\)\?//p')"
 
 		# Already the newest? Skip
diff --git a/script/update-mail-to-commit-notes.sh b/script/update-mail-to-commit-notes.sh
@@ -21,7 +21,7 @@ git_remote="${GITGIT_GIT_REMOTE:-https://github.com/gitgitgadget/git}"
 update_gitgit_dir () {
 	test -d "$GITGIT_DIR" ||
 	git clone $git_remote "$GITGIT_DIR" ||
-	die "Could not clone $gitremote to $GITGIT_DIR"
+	die "Could not clone $git_remote to $GITGIT_DIR"
 
 	git -C "$GITGIT_DIR" fetch $git_remote \
 		refs/notes/mail-to-commit:refs/notes/mail-to-commit ||

-Original file line number
+Diff line change
 /obj/**
 /*.sln*
 /*.njsproj*
 -/*.tgz
Original file line number	Diff line number	Diff line change
`@@ -524,7 +524,7 @@ export class CIHelper {`
`524`	`524`	`const prKey = getPullRequestKeyFromURL(prMeta.pullRequestURL);`
`525`	`525`	const fetchURL = `https://github.com/${prKey.owner}/${prKey.repo}`;
`526`	`526`	const fetchRef = `refs/pull/${prKey.pull_number}/head`;
`527`		`- await git(["fetch", fetchURL, fetchRef, prMeta.latestTag], {`
	`527`	`+ await git(["fetch", "--no-tags", fetchURL, fetchRef, prMeta.latestTag], {`
`528`	`528`	`workDir: this.workDir,`
`529`	`529`	`});`
`530`	`530`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,17 @@ export class MailCommitMapping {`
`43`	`43`	`}`
`44`	`44`	`if (refs.length) {`
`45`	`45`	console.log(`Updating mail-to-commit/refs: ${refs.join(", ")}`);
`46`		- await git(["fetch", `https://github.com/${this.config.repo.owner}/${this.config.repo.name}`, ...refs], {
`47`		`- workDir: this.workDir,`
`48`		`- });`
	`46`	`+ await git(`
	`47`	`+ [`
	`48`	`+ "fetch",`
	`49`	`+ "--no-tags",`
	`50`	+ `https://github.com/${this.config.repo.owner}/${this.config.repo.name}`,
	`51`	`+ ...refs,`
	`52`	`+ ],`
	`53`	`+ {`
	`54`	`+ workDir: this.workDir,`
	`55`	`+ },`
	`56`	`+ );`
`49`	`57`	`}`
`50`	`58`	`}`
`51`	`59`	`}`