refactor: replace references of "master" with "trunk" (#1471)

sudoforge created 4 months ago

Change-Id: Iddffb45d6ab73096e2c27e8e5029eabe47e092d8

Change summary

.github/workflows/presubmit.yml | 2 +-
.github/workflows/scan.yml      | 6 ++++--
CONTRIBUTING.md                 | 4 ++--
README.md                       | 2 +-
bridge/jira/config.go           | 2 +-
entity/dag/example_test.go      | 2 +-
6 files changed, 10 insertions(+), 8 deletions(-)

Detailed changes

.github/workflows/presubmit.yml

@@ -14,7 +14,7 @@ on:
       - checks_requested
   pull_request:
     branches:
-      - master
+      - trunk
 
 concurrency:
   group: ${{ github.ref }}

.github/workflows/scan.yml

@@ -3,9 +3,11 @@ name: scan
 
 on:
   push:
-    branches: [master]
+    branches:
+      - trunk
   pull_request:
-    branches: [master]
+    branches:
+      - trunk
   schedule:
     - cron: '0 12 * * 6'
 

CONTRIBUTING.md

@@ -348,8 +348,8 @@ ______________________________________________________________________
 [doc/design/model]: ./doc/design/data-model.md
 [envrc]: ./.envrc
 [example-entity]: ./entity/dag/example_test.go
-[install/direnv]: https://github.com/direnv/direnv/blob/master/docs/installation.md
-[install/direnv/shell]: https://github.com/direnv/direnv/blob/master/docs/hook.md
+[install/direnv]: https://github.com/direnv/direnv/blob/trunk/docs/installation.md
+[install/direnv/shell]: https://github.com/direnv/direnv/blob/trunk/docs/hook.md
 [install/nix]: https://nix.dev/install-nix
 [issue/1364]: https://github.com/git-bug/git-bug/issues/1364
 [treefmt]: ./treefmt.nix

README.md

@@ -1,6 +1,6 @@
 <div align="center">
 
-<img width="64px" src="https://cdn.rawgit.com/git-bug/git-bug/master/misc/logo/logo-alpha-flat-bg.svg">
+<img width="64px" src="https://cdn.rawgit.com/git-bug/git-bug/trunk/misc/logo/logo-alpha-flat-bg.svg">
 
 # git-bug: a decentralized issue tracker
 

bridge/jira/config.go

@@ -15,7 +15,7 @@ const moreConfigText = `
 NOTE: There are a few optional configuration values that you can additionally
 set in your git configuration to influence the behavior of the bridge. Please
 see the notes at:
-https://github.com/git-bug/git-bug/blob/master/doc/jira_bridge.md
+https://github.com/git-bug/git-bug/blob/trunk/doc/jira_bridge.md
 `
 
 const credTypeText = `

entity/dag/example_test.go

@@ -13,7 +13,7 @@ import (
 )
 
 // Note: you can find explanations about the underlying data model here:
-// https://github.com/git-bug/git-bug/blob/master/doc/design/data-model.md
+// https://github.com/git-bug/git-bug/blob/trunk/doc/design/data-model.md
 
 // This file explains how to define a replicated data structure, stored in and using git as a medium for
 // synchronisation. To do this, we'll use the entity/dag package, which will do all the complex handling.