Skip to content

Commit 6edded1

Browse files
andyoneandyone
authored
Merge pull request #22 from essentialkaos/develop
Version 1.0.6
2 parents b4d46b7 + 503e881 commit 6edded1

10 files changed

Lines changed: 87 additions & 22 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
version: 2
2+
3+
updates:
4+
- package-ecosystem: "gomod"
5+
directory: "/"
6+
target-branch: "develop"
7+
schedule:
8+
interval: "daily"
9+
timezone: "Europe/London"
10+
time: "03:00"
11+
labels:
12+
- "PR • MAINTENANCE"
13+
assignees:
14+
- "andyone"
15+
reviewers:
16+
- "andyone"
17+
18+
- package-ecosystem: "github-actions"
19+
directory: "/"
20+
target-branch: "develop"
21+
schedule:
22+
interval: "daily"
23+
timezone: "Europe/London"
24+
time: "04:00"
25+
labels:
26+
- "PR • MAINTENANCE"
27+
assignees:
28+
- "andyone"
29+
reviewers:
30+
- "andyone"

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
strategy:
1919
matrix:
20-
go: [ '1.16.x', '1.17.x' ]
20+
go: [ '1.17.x', '1.18.x' ]
2121

2222
steps:
2323
- name: Set up Go
@@ -32,7 +32,7 @@ jobs:
3232
echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
3333
3434
- name: Checkout
35-
uses: actions/checkout@v2
35+
uses: actions/checkout@v3
3636
with:
3737
path: ${{env.SRC_DIR}}
3838

@@ -56,7 +56,7 @@ jobs:
5656
run: goveralls -service github -coverprofile cover.out
5757

5858
- name: Set up Node.js
59-
uses: actions/setup-node@v1
59+
uses: actions/setup-node@v3
6060
with:
6161
node-version: '14.x'
6262

@@ -84,7 +84,7 @@ jobs:
8484
- name: Set up Go
8585
uses: actions/setup-go@v2
8686
with:
87-
go-version: '1.16.x'
87+
go-version: '1.17.x'
8888
id: go
8989

9090
- name: Setup PATH
@@ -94,7 +94,7 @@ jobs:
9494
echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
9595
9696
- name: Checkout
97-
uses: actions/checkout@v2
97+
uses: actions/checkout@v3
9898
with:
9999
path: ${{env.SRC_DIR}}
100100

‎.github/workflows/godoc.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ jobs:
1010

1111
steps:
1212
- name: Trigger GoSumDB and PkgGoDev
13-
uses: essentialkaos/pkgre-godoc-action@v1
13+
uses: essentialkaos/godoc-action@v1

‎Makefile‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,36 @@
11
################################################################################
22

3-
# This Makefile generated by GoMakeGen 1.3.2 using next command:
4-
# gomakegen .
3+
# This Makefile generated by GoMakeGen 1.5.1 using next command:
4+
# gomakegen --mod .
55
#
66
# More info: https://kaos.sh/gomakegen
77

88
################################################################################
99

10+
export GO111MODULE=on
11+
1012
.DEFAULT_GOAL := help
11-
.PHONY = fmt vet git-config deps-test test help
13+
.PHONY = fmt vet deps deps-test test mod-init mod-update mod-vendor help
1214

1315
################################################################################
1416

15-
git-config: ## Configure git redirects for stable import path services
16-
git config --global http.https://pkg.re.followRedirects true
17+
deps: mod-update ## Download dependencies
1718

18-
deps-test: git-config ## Download dependencies for tests
19-
go get -d -v pkg.re/essentialkaos/check.v1
19+
deps-test: deps ## Download dependencies for tests
2020

2121
test: ## Run tests
2222
go test -covermode=count .
2323

24+
mod-init: ## Initialize new module
25+
go mod init
26+
go mod tidy
27+
28+
mod-update: ## Download modules to local cache
29+
go mod download
30+
31+
mod-vendor: ## Make vendored copy of dependencies
32+
go mod vendor
33+
2434
fmt: ## Format source code with gofmt
2535
find . -name "*.go" -exec gofmt -s -w {} \;
2636

@@ -32,6 +42,6 @@ help: ## Show this info
3242
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
3343
| awk 'BEGIN {FS = ":.*?## "}; {printf " \033[33m%-12s\033[0m %s\n", $$1, $$2}'
3444
@echo -e ''
35-
@echo -e '\033[90mGenerated by GoMakeGen 1.3.2\033[0m\n'
45+
@echo -e '\033[90mGenerated by GoMakeGen 1.5.1\033[0m\n'
3646

3747
################################################################################

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<p align="center"><a href="#readme"><img src="https://gh.kaos.st/go-jar.svg"/></a></p>
22

33
<p align="center">
4-
<a href="https://kaos.sh/g/go-jar.v1"><img src="https://gh.kaos.st/godoc.svg" alt="PkgGoDev" /></a>
4+
<a href="https://kaos.sh/g/go-jar"><img src="https://gh.kaos.st/godoc.svg" alt="PkgGoDev" /></a>
55
<a href="https://kaos.sh/r/go-jar"><img src="https://kaos.sh/r/go-jar.svg" alt="GoReportCard" /></a>
66
<a href="https://kaos.sh/w/go-jar/ci"><img src="https://kaos.sh/w/go-jar/ci.svg" alt="GitHub Actions CI Status" /></a>
77
<a href="https://kaos.sh/w/go-jar/codeql"><img src="https://kaos.sh/w/go-jar/codeql.svg" alt="GitHub Actions CodeQL Status" /></a>
@@ -18,16 +18,16 @@
1818

1919
### Installation
2020

21-
Make sure you have a working Go 1.16+ workspace (_[instructions](https://golang.org/doc/install)_), then:
21+
Make sure you have a working Go 1.17+ workspace (_[instructions](https://golang.org/doc/install)_), then:
2222

2323
```
24-
go get -d pkg.re/essentialkaos/go-jar.v1
24+
go get -d github.com/essentialkaos/go-jar
2525
```
2626

2727
For update to the latest stable release, do:
2828

2929
```
30-
go get -d -u pkg.re/essentialkaos/go-jar.v1
30+
go get -d -u github.com/essentialkaos/go-jar
3131
```
3232

3333
### Build Status

‎examples_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package jar
22

33
// ////////////////////////////////////////////////////////////////////////////////// //
44
// //
5-
// Copyright (c) 2021 ESSENTIAL KAOS //
5+
// Copyright (c) 2022 ESSENTIAL KAOS //
66
// Apache License, Version 2.0 <https://www.apache.org/licenses/LICENSE-2.0> //
77
// //
88
// ////////////////////////////////////////////////////////////////////////////////// //

‎go.mod‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
module github.com/essentialkaos/go-jar
2+
3+
go 1.17
4+
5+
require github.com/essentialkaos/check v1.2.1
6+
7+
require (
8+
github.com/kr/pretty v0.3.0 // indirect
9+
github.com/kr/text v0.2.0 // indirect
10+
github.com/rogpeppe/go-internal v1.6.1 // indirect
11+
)

‎go.sum‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
2+
github.com/essentialkaos/check v1.2.1 h1:avvyFy/1acUNwfxwuOLsHeCjfXtMygtbu0lVDr3nxFs=
3+
github.com/essentialkaos/check v1.2.1/go.mod h1:PhxzfJWlf5L/skuyhzBLIvjMB5Xu9TIyDIsqpY5MvB8=
4+
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
5+
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
6+
github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
7+
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
8+
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
9+
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
10+
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
11+
github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
12+
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
13+
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
14+
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=

‎jar.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package jar
22

33
// ////////////////////////////////////////////////////////////////////////////////// //
44
// //
5-
// Copyright (c) 2021 ESSENTIAL KAOS //
5+
// Copyright (c) 2022 ESSENTIAL KAOS //
66
// Apache License, Version 2.0 <https://www.apache.org/licenses/LICENSE-2.0> //
77
// //
88
// ////////////////////////////////////////////////////////////////////////////////// //

‎jar_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ package jar
22

33
// ////////////////////////////////////////////////////////////////////////////////// //
44
// //
5-
// Copyright (c) 2021 ESSENTIAL KAOS //
5+
// Copyright (c) 2022 ESSENTIAL KAOS //
66
// Apache License, Version 2.0 <https://www.apache.org/licenses/LICENSE-2.0> //
77
// //
88
// ////////////////////////////////////////////////////////////////////////////////// //
99

1010
import (
1111
"testing"
1212

13-
. "pkg.re/essentialkaos/check.v1"
13+
. "github.com/essentialkaos/check"
1414
)
1515

1616
// ////////////////////////////////////////////////////////////////////////////////// //

0 commit comments

Comments
 (0)