diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 88f6389..9cc962b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,6 +28,11 @@ jobs: - name: Vet run: go vet ./... - - name: CodeCovif - if: matrix.platform != 'windows-latest' - run: bash <(curl -s https://codecov.io/bash) + # - name: Upload coverage reports to Codecov + # uses: codecov/codecov-action@v4.0.1 + # with: + # token: ${{ secrets.CODECOV_TOKEN }} + # + # - name: CodeCovif + # if: matrix.platform != 'windows-latest' + # run: bash <(curl -s https://codecov.io/bash) diff --git a/CHANGELOG.md b/CHANGELOG.md index a69b48d..1e5e6a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## Unreleased +## [v1.1.5] - 2024-05-23 Thu + +- Add: update dictionaries +- Add: update modules + ## [v1.1.4] - 2023-02-02 Fri - Add: use `slices` package for sorting. diff --git a/Makefile b/Makefile index 3227ee7..77fcb7b 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ DATE = $(shell date -u '+%Y-%m-%d_%H:%M:%S%Z') NO_C = CGO_ENABLED=0 FLAGS_SHARED = $(NO_C) GOARCH=amd64 +FLAGS_MAC_ARM = $(NO_C) $GOARCH=arm64 GOOS=darwin FLAGS_LD = -trimpath -ldflags "-w -s \ -X github.com/gnames/$(PROJ_NAME)/pkg.Build=$(DATE) \ -X github.com/gnames/$(PROJ_NAME)/pkg.Version=$(VERSION)" @@ -21,7 +22,7 @@ GOGET = $(GOCMD) get all: install -test: deps install +test: go test -shuffle=on -count=1 -race -coverprofile=coverage.txt -covermode=atomic ./... tools: deps @@ -48,7 +49,7 @@ release: dockerhub $(FLAGS_SHARED) GOOS=linux $(GORELEASE); \ tar zcvf /tmp/$(PROJ_NAME)-$(VER)-linux.tar.gz $(PROJ_NAME); \ $(GOCLEAN); \ - $(FLAGS_SHARED) GOOS=darwin $(GORELEASE); \ + $(FLAGS_MAC_ARM) $(GORELEASE); \ tar zcvf /tmp/$(PROJ_NAME)-$(VER)-mac.tar.gz $(PROJ_NAME); \ $(GOCLEAN); \ $(FLAGS_SHARED) GOOS=windows $(GORELEASE); \ diff --git a/README.md b/README.md index 75ef7b7..0cf8027 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # Global Names Finder (GNfinder) [](https://zenodo.org/badge/latestdoi/137407958) -[![Build Status][travis-img]][travis] [![Doc Status][doc-img]][doc] [![Go Report Card][go-report-img]][go-report] @@ -77,7 +76,7 @@ as a [RESTful API][apidoc]. [Homebrew] is a popular package manager for Open Source software originally developed for Mac OS X. Now it is also available on Linux, and can easily be used on MS Windows 10 or 11, if Windows Subsystem for Linux (WSL) is -[installed][WSL install]. +[installed][wsl]. Note that [Homebrew] requires some other programs to be installed, like Curl, Git, a compiler (GCC compiler on Linux, Xcode on Mac). If it is too much, diff --git a/pkg/cli_test.go b/pkg/cli_test.go deleted file mode 100644 index db4346c..0000000 --- a/pkg/cli_test.go +++ /dev/null @@ -1,50 +0,0 @@ -package gnfinder - -import ( - "bytes" - "log" - "testing" - - "github.com/gnames/gnfinder/pkg/config" - "github.com/gnames/gnfinder/pkg/ent/verifier" - "github.com/rendon/testcli" - "github.com/stretchr/testify/assert" -) - -// Run make install before these tests to get meaningful -// results. - -func TestVersion(t *testing.T) { - c := testcli.Command("gnfinder", "-V") - c.Run() - if !c.Success() { - log.Println("Run `make install` for CLI tests to work") - } - assert.True(t, c.Success()) - assert.Contains(t, c.Stdout(), "version:") -} - -func TestFind(t *testing.T) { - gnv := verifier.New(config.New().VerifierURL, []int{}, false) - c := testcli.Command("gnfinder", "-f", "pretty") - stdin := bytes.NewBuffer([]byte("Pardosa moesta is a spider")) - c.SetStdin(stdin) - c.Run() - if !c.Success() { - log.Println("Run `make install` for CLI tests to work") - } - assert.True(t, c.Success()) - assert.Contains(t, c.Stdout(), `cardinality": 2`) - assert.NotContains(t, c.Stdout(), `"matchType": "Exact`) - - if gnv.IsConnected() { - c = testcli.Command("gnfinder", "-v", "-f", "pretty") - stdin = bytes.NewBuffer([]byte("Pardosa moesta is a spider")) - c.SetStdin(stdin) - c.Run() - assert.True(t, c.Success()) - assert.Contains(t, c.Stdout(), `"matchType": "Exact`) - } else { - log.Println("WARNING: Cannot connect to internet, skipping some tests") - } -}