Skip to content

Commit

Permalink
Merge pull request #226 from cablespaghetti/master
Browse files Browse the repository at this point in the history
Fix pagination bug #225 and fix tests on Ubuntu
  • Loading branch information
ivanilves authored Oct 4, 2020
2 parents 8706a12 + 9ea36fc commit f0f14d8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ jobs:
- run:
name: Build release assets and binaries
command: |
git reset --hard
make release
./dist/assets/lstags-linux/lstags --version
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ unit-test:
@find . \
-mindepth 2 -type f ! -path "./vendor/*" ! -path "./api/*" -name "*_test.go" \
| xargs -I {} dirname {} \
| xargs -I {} sh -c "pushd {}; go test -v -cover || exit 1; popd"
| xargs -I {} bash -c "pushd {}; go test -v -cover || exit 1; popd"

whitebox-integration-test:
@find . \
-mindepth 2 -type f -path "./api/*" -name "*_test.go" \
| xargs -I {} dirname {} \
| xargs -I {} sh -c "pushd {}; go test -v -cover || exit 1; popd"
| xargs -I {} bash -c "pushd {}; go test -v -cover || exit 1; popd"

coverage: PROJECT:=github.com/ivanilves/lstags
coverage: SERVICE:=ci
Expand Down
2 changes: 1 addition & 1 deletion api/v1/registry/client/request/request.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func getNextLink(headers []string) string {
nextlink := headers[0]

nextlink = strings.Split(nextlink, "?")[1]
nextlink = strings.Split(nextlink, ";")[0]
nextlink = strings.Split(nextlink, ">")[0]

return nextlink
}

0 comments on commit f0f14d8

Please sign in to comment.