chore: change to main named branch and modify workflows

planetary-social · Feb 5, 2023 · 5594b8c · 5594b8c
1 parent 3ede1e5
commit 5594b8c
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 12 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -14,4 +14,5 @@
 .idea/dataSources.local.xml
 fly.toml
 .vs
-*.sqlite
+*.sqlite
+coverage*
diff --git a/.github/workflows/dive-check.yml b/.github/workflows/dive-check.yml
@@ -1,9 +1,9 @@
 name: CI Dive Check
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/fly.yml b/.github/workflows/fly.yml
@@ -2,7 +2,7 @@ name: Fly Deploy
 on:
   push:
     branches:
-    - master
+    - main
   workflow_dispatch:
 jobs:
   deploy:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,10 +1,10 @@
-name: CI Build & Test
+name: CI Build & Test with coverage
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "main" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "main" ]
 
 jobs:
 
@@ -22,4 +22,10 @@ jobs:
         run: go build -v ./...
 
       - name: Test & Coverage
-        run: go test -v ./... -cover
+        run: go test -v ./... -race -covermode=atomic -coverprofile=coverage.out
+
+      - name: Upload coverage reports to Codecov
+        run: |
+          curl -Os https://uploader.codecov.io/latest/linux/codecov
+          chmod +x codecov
+          ./codecov -t ${CODECOV_TOKEN}
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@ db
 .idea
 .vs
 dist
-*.sqlite
+*.sqlite
+coverage*
diff --git a/README.md b/README.md
@@ -4,6 +4,8 @@
 [![Fly Deploy](https://github.com/piraces/rsslay/actions/workflows/fly.yml/badge.svg)](https://github.com/piraces/rsslay/actions/workflows/fly.yml)
 [![CI Dive Check](https://github.com/piraces/rsslay/actions/workflows/dive-check.yml/badge.svg)](https://github.com/piraces/rsslay/actions/workflows/dive-check.yml)
 [![Publish Docker image](https://github.com/piraces/rsslay/actions/workflows/docker-publish.yml/badge.svg)](https://github.com/piraces/rsslay/actions/workflows/docker-publish.yml)
+[![codecov](https://codecov.io/gh/piraces/rsslay/branch/main/graph/badge.svg?token=tNKcOjlxLo)](https://codecov.io/gh/piraces/rsslay)
+
 ![Docker Hub](https://img.shields.io/docker/pulls/piraces/rsslay?logo=docker)
 
 [![Go Report Card](https://goreportcard.com/badge/github.com/piraces/rsslay)](https://goreportcard.com/report/github.com/piraces/rsslay)
@@ -178,3 +180,5 @@ Also on [the bird site](https://twitter.com/piraces_), and [Mastodon](https://ha
 
 [Unlicense](https://unlicense.org).
 
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fpiraces%2Frsslay.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fpiraces%2Frsslay?ref=badge_large)
+
diff --git a/web/templates/created.html.tmpl b/web/templates/created.html.tmpl
@@ -82,7 +82,7 @@
         <p>
             <strong>rsslay</strong> original work by <a href="https://fiatjaf.com">fiatjaf</a> modifications by <a
                 href="https://piraces.dev">piraces</a>. The source code is
-            <a href="https://github.com/piraces/rsslay/blob/master/LICENSE">UNlicensed</a>. Keep the good vibes 🤙
+            <a href="https://github.com/piraces/rsslay/blob/main/LICENSE">UNlicensed</a>. Keep the good vibes 🤙
         </p>
     </div>
 </footer>

diff --git a/web/templates/index.html.tmpl b/web/templates/index.html.tmpl
@@ -139,7 +139,7 @@
         <p>
             <strong>rsslay</strong> original work by <a href="https://fiatjaf.com">fiatjaf</a> modifications by <a
                 href="https://piraces.dev">piraces</a>. The source code is
-            <a href="https://github.com/piraces/rsslay/blob/master/LICENSE">UNlicensed</a>. Keep the good vibes 🤙
+            <a href="https://github.com/piraces/rsslay/blob/main/LICENSE">UNlicensed</a>. Keep the good vibes 🤙
         </p>
     </div>
 </footer>

diff --git a/web/templates/search.html.tmpl b/web/templates/search.html.tmpl
@@ -145,7 +145,7 @@
         <p>
             <strong>rsslay</strong> original work by <a href="https://fiatjaf.com">fiatjaf</a> modifications by <a
                 href="https://piraces.dev">piraces</a>. The source code is
-            <a href="https://github.com/piraces/rsslay/blob/master/LICENSE">UNlicensed</a>. Keep the good vibes 🤙
+            <a href="https://github.com/piraces/rsslay/blob/main/LICENSE">UNlicensed</a>. Keep the good vibes 🤙
         </p>
     </div>
 </footer>
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: Fly Deploy @@
     on:
       push:
         branches:
-        - master
+        - main
       workflow_dispatch:
     jobs:
       deploy:
@@ Expand Down @@