Merge branch 'main' into BUX-705/Gitbook

bitcoin-sv · Apr 11, 2024 · 91e2e55 · 91e2e55
2 parents 5d67d57 + add5738
commit 91e2e55
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 14 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,7 +3,7 @@ version: 2
 updates:
   # Maintain dependencies for the core library
   - package-ecosystem: "gomod"
-    target-branch: "master"
+    target-branch: "main"
     directory: "/"
     schedule:
       interval: "weekly"
@@ -13,7 +13,7 @@ updates:
     open-pull-requests-limit: 10
 
   - package-ecosystem: "gomod"
-    target-branch: "master"
+    target-branch: "main"
     directory: "/engine"
     schedule:
       interval: "weekly"
@@ -23,7 +23,7 @@ updates:
     open-pull-requests-limit: 10
 
   - package-ecosystem: "gomod"
-    target-branch: "master"
+    target-branch: "main"
     directory: "/models"
     schedule:
       interval: "weekly"
@@ -34,7 +34,7 @@ updates:
 
   # Maintain dependencies for GitHub Actions
   - package-ecosystem: "github-actions"
-    target-branch: "master"
+    target-branch: "main"
     directory: "/"
     schedule:
       interval: "weekly"
@@ -45,7 +45,7 @@ updates:
 
   # Maintain dependencies for Docker
   - package-ecosystem: "docker"
-    target-branch: "master"
+    target-branch: "main"
     directory: "/"
     schedule:
       interval: "weekly"
@@ -56,7 +56,7 @@ updates:
 
   # Maintain dependencies for Docker
   - package-ecosystem: "docker"
-    target-branch: "master"
+    target-branch: "main"
     directory: "/release"
     schedule:
       interval: "weekly"

diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -176,7 +176,7 @@ pull_request_rules:
 
   - name: Close stale pull request
     conditions:
-      - base=master
+      - base=main
       - -closed
       - updated-at<21 days ago
     actions:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -7,10 +7,14 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [master]
+    branches:
+      - master
+      - main
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [master]
+    branches:
+      - master
+      - main
   # schedule:
   #  - cron: '0 23 * * 0'
 

diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml
@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - master
+      - main
     paths:
       - .github/labels.yml
 jobs:

diff --git a/README.md b/README.md
@@ -4,9 +4,9 @@
 
 
 [![Release](https://img.shields.io/github/release-pre/bitcoin-sv/spv-wallet.svg?logo=github&style=flat&v=3)](https://github.com/bitcoin-sv/spv-wallet/releases)
-[![Build Status](https://img.shields.io/github/actions/workflow/status/bitcoin-sv/spv-wallet/run-tests.yml?branch=master&v=3)](https://github.com/bitcoin-sv/spv-wallet/actions)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/bitcoin-sv/spv-wallet/run-tests.yml?branch=main&v=3)](https://github.com/bitcoin-sv/spv-wallet/actions)
 [![Report](https://goreportcard.com/badge/github.com/bitcoin-sv/spv-wallet?style=flat&v=3)](https://goreportcard.com/report/github.com/bitcoin-sv/spv-wallet)
-[![codecov](https://codecov.io/gh/bitcoin-sv/spv-wallet/branch/master/graph/badge.svg?v=3)](https://codecov.io/gh/bitcoin-sv/spv-wallet)
+[![codecov](https://codecov.io/gh/bitcoin-sv/spv-wallet/branch/main/graph/badge.svg?v=3)](https://codecov.io/gh/bitcoin-sv/spv-wallet)
 [![Mergify Status](https://img.shields.io/endpoint.svg?url=https://api.mergify.com/v1/badges/bitcoin-sv/spv-wallet&style=flat&v=3)](https://mergify.io)
 <br>
 

diff --git a/engine/README.md b/engine/README.md
@@ -3,9 +3,9 @@
 # SPV Wallet Engine
 
 [![Release](https://img.shields.io/github/release-pre/bitcoin-sv/spv-wallet/engine.svg?logo=github&style=flat&v=2)](https://github.com/bitcoin-sv/spv-wallet/engine/releases)
-[![Build Status](https://img.shields.io/github/actions/workflow/status/bitcoin-sv/spv-wallet/engine/run-tests.yml?branch=master&v=2)](https://github.com/bitcoin-sv/spv-wallet/engine/actions)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/bitcoin-sv/spv-wallet/engine/run-tests.yml?branch=main&v=2)](https://github.com/bitcoin-sv/spv-wallet/engine/actions)
 [![Report](https://goreportcard.com/badge/github.com/bitcoin-sv/spv-wallet/engine?style=flat&v=2)](https://goreportcard.com/report/github.com/bitcoin-sv/spv-wallet/engine)
-[![codecov](https://codecov.io/gh/bitcoin-sv/spv-wallet/engine/branch/master/graph/badge.svg?v=2)](https://codecov.io/gh/bitcoin-sv/spv-wallet/engine)
+[![codecov](https://codecov.io/gh/bitcoin-sv/spv-wallet/engine/branch/main/graph/badge.svg?v=2)](https://codecov.io/gh/bitcoin-sv/spv-wallet/engine)
 [![Mergify Status](https://img.shields.io/endpoint.svg?url=https://api.mergify.com/v1/badges/bitcoin-sv/spv-wallet/engine&style=flat&v=2)](https://mergify.com)
 <br>
 

diff --git a/release/Dockerfile b/release/Dockerfile
@@ -8,7 +8,7 @@ ARG version
 ARG tag
 ENV APP_BINARY=${project_name}
 ENV VERSION=${version:-develop}
-ENV TAG=${tag:-master}
+ENV TAG=${tag:-main}
 COPY ./release/entrypoint.sh .
 RUN chmod +x entrypoint.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ on: @@
       push:
         branches:
           - master
+          - main
         paths:
           - .github/labels.yml
     jobs:
@@ Expand Down @@