fix: merge main into PR branch, resolve CI and go.mod conflicts

- Keep go-version-file: 'go.mod' from PR (reads Go version from go.mod)
- Keep gitea.hansenits.com.au module path in coverage check
- Pick up .gitignore bin/* entry from main
- go.mod: keep go 1.24.0 directive from main (GOTOOLCHAIN=local)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: multica-agent <github@multica.ai>
This commit is contained in:
Gary Hansen
2026-06-17 22:05:16 +10:00
co-authored by Copilot multica-agent
3 changed files with 7 additions and 6 deletions
+5 -5
View File
@@ -18,21 +18,21 @@ jobs:
cache: true
- name: Vet
run: go vet ./...
run: GOTOOLCHAIN=local go vet ./...
- name: Test
run: go test -v -race -coverprofile=coverage.out ./...
run: GOTOOLCHAIN=local go test -v -race -coverprofile=coverage.out ./...
- name: Coverage report
run: go tool cover -func=coverage.out
run: GOTOOLCHAIN=local go tool cover -func=coverage.out
- name: Check internal package coverage
run: |
COVERAGE=$(go tool cover -func=coverage.out | grep "^gitea.hansenits.com.au/hits/ExploreDNS/internal" | awk '{print $3}' | sed 's/%//' | awk '{sum+=$1; count++} END {if(count>0) print sum/count; else print 0}')
COVERAGE=$(GOTOOLCHAIN=local go tool cover -func=coverage.out | grep "^gitea.hansenits.com.au/hits/ExploreDNS/internal" | awk '{print $3}' | sed 's/%//' | awk '{sum+=$1; count++} END {if(count>0) print sum/count; else print 0}')
echo "Average internal package coverage: ${COVERAGE}%"
- name: Build
run: go build -v ./...
run: GOTOOLCHAIN=local go build -v ./...
docker:
runs-on: ubuntu-latest