Make a couple miscellaneous meta tweaks (#1500)

- Update badges to Node.js 18.18 - Say "master" less
seek-oss · Mar 25, 2024 · 80d97ad · 80d97ad
1 parent 4049ce9
commit 80d97ad
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 [![GitHub Release](https://github.com/seek-oss/skuba/workflows/Release/badge.svg?branch=master)](https://github.com/seek-oss/skuba/actions?query=workflow%3ARelease)
 [![GitHub Validate](https://github.com/seek-oss/skuba/workflows/Validate/badge.svg?branch=master)](https://github.com/seek-oss/skuba/actions?query=workflow%3AValidate)
-[![Node.js version](https://img.shields.io/badge/node-%3E%3D%2018.12-brightgreen)](https://nodejs.org/en/)
+[![Node.js version](https://img.shields.io/badge/node-%3E%3D%2018.18-brightgreen)](https://nodejs.org/en/)
 [![npm package](https://img.shields.io/npm/v/skuba)](https://www.npmjs.com/package/skuba)
 
 ---

diff --git a/docs/cli/init.md b/docs/cli/init.md
@@ -93,7 +93,7 @@ Installing dependencies...
 ✔ All done! Try running:
 
 cd my-repo
-git push --set-upstream origin master
+git push --set-upstream origin main
 ```
 
 You can now proceed to the [next steps](#next-steps).

diff --git a/docs/development-api/git.md b/docs/development-api/git.md
@@ -153,7 +153,7 @@ import { Git } from 'skuba';
 
 await Git.reset({
   dir,
-  branch: 'master',
+  branch: 'main',
   commitId: 'abcd1234',
   hard: true,
 });

diff --git a/integration/git/new.json b/integration/git/new.json
@@ -7,5 +7,5 @@
   ".git/refs/tags": null,
   ".git/config": "[core]\nrepositoryformatversion = 0\nfilemode = true\nbare = true\nignorecase = true\nprecomposeunicode = true\n",
   ".git/description": "Unnamed repository; edit this file 'description' to name the repository.\n",
-  ".git/HEAD": "ref: refs/heads/master\n"
+  ".git/HEAD": "ref: refs/heads/main\n"
 }
diff --git a/packages/eslint-config-skuba/README.md b/packages/eslint-config-skuba/README.md
@@ -1,8 +1,7 @@
 # eslint-config-skuba
 
-[![GitHub Release](https://github.com/seek-oss/eslint-config-skuba/workflows/Release/badge.svg?branch=master)](https://github.com/seek-oss/eslint-config-skuba/actions?query=workflow%3ARelease)
-[![GitHub Validate](https://github.com/seek-oss/eslint-config-skuba/workflows/Validate/badge.svg?branch=master)](https://github.com/seek-oss/eslint-config-skuba/actions?query=workflow%3AValidate)
-[![Powered by skuba](https://img.shields.io/badge/🤿%20skuba-powered-009DC4)](https://github.com/seek-oss/skuba)
+[![Node.js version](https://img.shields.io/badge/node-%3E%3D%2018.18-brightgreen)](https://nodejs.org/en/)
+[![npm package](https://img.shields.io/npm/v/eslint-config-skuba)](https://www.npmjs.com/package/eslint-config-skuba)
 
 Shareable ESLint config for **[skuba]**.
 

diff --git a/src/api/git/reset.int.test.ts b/src/api/git/reset.int.test.ts
@@ -34,7 +34,7 @@ describe('soft', () => {
       author,
     });
 
-    await reset({ dir, branch: 'master', commitId: initialCommit });
+    await reset({ dir, branch: 'main', commitId: initialCommit });
 
     const commits = await git.log({
       fs,
@@ -69,7 +69,7 @@ describe('hard', () => {
 
     await reset({
       dir,
-      branch: 'master',
+      branch: 'main',
       commitId: initialCommit,
       hard: true,
     });
@@ -98,7 +98,7 @@ describe('hard', () => {
 
     await reset({
       dir,
-      branch: 'master',
+      branch: 'main',
       commitId: initialCommit,
       hard: true,
     });
@@ -128,7 +128,7 @@ describe('hard', () => {
 
     await reset({
       dir,
-      branch: 'master',
+      branch: 'main',
       commitId: initialCommit,
       hard: true,
     });
@@ -166,7 +166,7 @@ describe('hard', () => {
 
     await reset({
       dir,
-      branch: 'master',
+      branch: 'main',
       commitId: initialCommit,
       hard: true,
     });