Skip to content

Commit

Permalink
Merge branch 'main' into update-circleci
Browse files Browse the repository at this point in the history
  • Loading branch information
EmmEff committed Aug 2, 2022
2 parents 21d6d49 + 9ac5730 commit 8b9cd69
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
@@ -1,21 +1,21 @@
version: 2.1

orbs:
codecov: codecov/codecov@1.2
codecov: codecov/codecov@3

executors:
node:
docker:
- image: node:16-slim
- image: node:17-slim
golangci-lint:
docker:
- image: golangci/golangci-lint:v1.47
golang-previous:
docker:
- image: golang:1.16
- image: golang:1.17
golang-latest:
docker:
- image: golang:1.17
- image: golang:1.18

jobs:
lint-markdown:
Expand Down
12 changes: 12 additions & 0 deletions .golangci.yml
@@ -1,15 +1,21 @@
linters:
disable-all: true
enable:
- bidichk
- bodyclose
- containedctx
- contextcheck
- deadcode
- decorder
- depguard
- dogsled
- dupl
- errcheck
- funlen
- gochecknoinits
- gocognit
- errchkjson
- gochecknoinits
- goconst
- gocritic
- gocyclo
Expand All @@ -20,17 +26,23 @@ linters:
- gosec
- gosimple
- govet
- grouper
- ineffassign
- ireturn
- maintidx
- misspell
- nakedret
- nilnil
- prealloc
- revive
- rowserrcheck
- staticcheck
- structcheck
- stylecheck
- tenv
- typecheck
- unconvert
- unparam
- unused
- varcheck
- whitespace
2 changes: 2 additions & 0 deletions LICENSE.md
@@ -1,5 +1,7 @@
# LICENSE

Copyright (c) 2018-2022, Sylabs Inc. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -2,7 +2,7 @@

[![PkgGoDev](https://pkg.go.dev/badge/github.com/sylabs/json-resp)](https://pkg.go.dev/github.com/sylabs/json-resp)
[![Build Status](https://circleci.com/gh/sylabs/json-resp.svg?style=shield)](https://circleci.com/gh/sylabs/workflows/json-resp)
[![Code Coverage](https://codecov.io/gh/sylabs/json-resp/branch/master/graph/badge.svg)](https://codecov.io/gh/sylabs/json-resp)
[![Code Coverage](https://codecov.io/gh/sylabs/json-resp/branch/main/graph/badge.svg)](https://codecov.io/gh/sylabs/json-resp)
[![Go Report Card](https://goreportcard.com/badge/github.com/sylabs/json-resp)](https://goreportcard.com/report/github.com/sylabs/json-resp)

The `json-resp` package contains a small set of functions that are used to marshall and unmarshall response data and errors in JSON format.
Expand Down
2 changes: 1 addition & 1 deletion json_response.go
@@ -1,4 +1,4 @@
// Copyright (c) 2018, Sylabs Inc. All rights reserved.
// Copyright (c) 2018-2021, Sylabs Inc. All rights reserved.
// This software is licensed under a 3-clause BSD license. Please consult the LICENSE.md file
// distributed with the sources of this project regarding your rights to use or distribute this
// software.
Expand Down
2 changes: 1 addition & 1 deletion json_response_test.go
@@ -1,4 +1,4 @@
// Copyright (c) 2018, Sylabs Inc. All rights reserved.
// Copyright (c) 2018-2021, Sylabs Inc. All rights reserved.
// This software is licensed under a 3-clause BSD license. Please consult the LICENSE.md file
// distributed with the sources of this project regarding your rights to use or distribute this
// software.
Expand Down

0 comments on commit 8b9cd69

Please sign in to comment.