fix tests after main branch rename; drop common make

some tests were failing after renaming master branch to main. fixed.

makefile: drop common-make includes; simplify make tasks

gha: bump GHA actions versions and configure dependabot to automate
updates

.github/dependabot.yml

@@ -4,3 +4,8 @@ updates:
     directory: /
     schedule:
       interval: daily
+
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly

.github/workflows/CI.yml

@@ -1,62 +1,52 @@
 name: CI
+
 on:
   push:
     branches:
-      - 'main'
+      - main
   pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
 
 jobs:
-  test:
+  lint:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/checkout@v4
 
-      - name: Restore Go Modules Cache
-        uses: actions/cache@v2
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
+      - name: Run golangci-lint
+        uses: golangci/golangci-lint-action@v6
 
-      - name: Environment Config
-        run: |
-          echo "$HOME/go/bin" >> $GITHUB_PATH
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
 
-      - name: Download Dependencies
-        run: |
-          go mod download
+      - name: Set up Go
+        uses: actions/setup-go@v5
 
       - name: Git Config for Unit Tests
         run: |
           git config --global user.email ci
           git config --global user.name ci
+          git config --global init.defaultBranch
 
       - name: Run Unit Tests
         run: |
-          make test-gha
-
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Run Linter
-        uses: golangci/golangci-lint-action@v2
+          make test
 
   goreleaser-check:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Check goreleaser's Configuration
-        uses: goreleaser/goreleaser-action@v2
+        uses: goreleaser/goreleaser-action@v6
         with:
           version: latest
           args: check

.gitignore

@@ -11,3 +11,4 @@ dist/
 Attic
 .vscode/
 /.idea/
+cover.out

Makefile

@@ -1,13 +1,22 @@
 APP := autotag
 
-include scripts/make/common.mk
-include scripts/make/common-go.mk
+.PHONY: lint build test cov run
 
-build::
-	CGO_ENABLED=0 go build -o $(APP)/$(APP)  $(APP)/*.go
+default: build
 
-snapshot:
-	@goreleaser --rm-dist --snapshot --debug
+build:
+	CGO_ENABLED=0 go build -trimpath -v -o $(APP)/$(APP)  $(APP)/*.go
+
+lint:
+	golangci-lint run -v ./...
+
+test:
+	go test -cover -coverprofile=cover.out -v ./...
 
-.PHONY:: test-gha
-test-gha:: test-go ## for running unit tests on GitHub Actions
+cov:
+	@echo "--- Coverage:"
+	go tool cover -html=cover.out
+	go tool cover -func cover.out
+
+snapshot:
+	@goreleaser --rm-dist --snapshot --debug

autotag_test.go

@@ -55,14 +55,16 @@ type testRepoSetup struct {
 // testing the autotag package.
 // You must call cleanupTestRepo(t, r.repo) to remove the temporary directory after running tests.
 func newTestRepo(t *testing.T, setup testRepoSetup) GitRepo {
+	t.Helper()
+
 	tr := createTestRepo(t, setup.branch)
 
 	repo, err := git.Open(tr)
 	checkFatal(t, err)
 
 	branch := setup.branch
 	if branch == "" {
-		branch = "master"
+		branch = "main"
 	}
 
 	tag := setup.initialTag
@@ -99,7 +101,6 @@ func newTestRepo(t *testing.T, setup testRepoSetup) GitRepo {
 		Scheme:                    setup.scheme,
 		Prefix:                    !setup.disablePrefix,
 	})
-
 	if err != nil {
 		t.Fatal("Error creating repo: ", err)
 	}
@@ -179,7 +180,7 @@ func TestValidateConfig(t *testing.T) {
 }
 
 func TestNewRepo(t *testing.T) {
-	var newRepoTests = []struct {
+	newRepoTests := []struct {
 		createBranch  string
 		requestBranch string
 		expectBranch  string
@@ -203,7 +204,6 @@ func TestNewRepo(t *testing.T) {
 			Branch:   tt.requestBranch,
 			RepoPath: repo.Path(),
 		})
-
 		if err != nil {
 			t.Fatal("Error creating repo: ", err)
 		}
@@ -243,7 +243,7 @@ func TestNewRepoMainAndMaster(t *testing.T) {
 	makeTag(repo, "v0.2.1")
 
 	// check results
-	var newRepoTests = []struct {
+	newRepoTests := []struct {
 		requestBranch string
 		expectBranch  string
 	}{
@@ -257,7 +257,6 @@ func TestNewRepoMainAndMaster(t *testing.T) {
 			Branch:   tt.requestBranch,
 			RepoPath: repo.Path(),
 		})
-
 		if err != nil {
 			t.Fatal("Error creating repo: ", err)
 		}