Skip to content

Commit 6034b37

Browse files
andyoneandyone
authored
Merge pull request #174 from essentialkaos/develop
Version 14.1.1
2 parents 1df726e + e7f2337 commit 6034b37

File tree

15 files changed

+2043
-82
lines changed

15 files changed

+2043
-82
lines changed

‎.codebeatsettings‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/bug.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: ❗ Bug Report
2+
description: File a bug report
3+
title: "[Bug]: "
4+
labels: ["issue • bug"]
5+
assignees:
6+
- andyone
7+
8+
body:
9+
- type: markdown
10+
attributes:
11+
value: |
12+
> [!IMPORTANT]
13+
> Before you open an issue, search GitHub Issues for a similar bug reports. If so, please add a 👍 reaction to the existing issue.
14+
15+
- type: textarea
16+
attributes:
17+
label: Module version info
18+
description: Output of `grep 'github.com/essentialkaos/sslscan' go.sum` command
19+
render: shell
20+
validations:
21+
required: true
22+
23+
- type: textarea
24+
attributes:
25+
label: Steps to reproduce
26+
description: Short guide on how to reproduce this problem on our site
27+
placeholder: |
28+
1. [First Step]
29+
2. [Second Step]
30+
3. [and so on...]
31+
validations:
32+
required: true
33+
34+
- type: textarea
35+
attributes:
36+
label: Expected behavior
37+
description: What you expected to happen
38+
validations:
39+
required: true
40+
41+
- type: textarea
42+
attributes:
43+
label: Actual behavior
44+
description: What actually happened
45+
validations:
46+
required: true
47+
48+
- type: textarea
49+
attributes:
50+
label: Additional info
51+
description: Include gist of relevant config, logs, etc.

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
blank_issues_enabled: false
2+
3+
contact_links:
4+
- name: Security Policies and Procedures
5+
url: https://github.com/essentialkaos/.github/blob/master/SECURITY.md
6+
about: Security procedures and general policies for all ESSENTIAL KAOS projects.
7+
8+
- name: Contributing Guidelines
9+
url: https://github.com/essentialkaos/contributing-guidelines/blob/master/CONTRIBUTING.md
10+
about: Contributing Guidelines for all ESSENTIAL KAOS projects
11+
12+
- name: Go Version Support Policy
13+
url: https://github.com/essentialkaos/.github/blob/master/GO-VERSION-SUPPORT.md
14+
about: Information about supported Go versions

‎.github/ISSUE_TEMPLATE/question.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: ❓ Question
2+
description: Question about application, configuration or code
3+
title: "[Question]: "
4+
labels: ["issue • question"]
5+
assignees:
6+
- andyone
7+
8+
body:
9+
- type: markdown
10+
attributes:
11+
value: |
12+
> [!IMPORTANT]
13+
> Before you open an issue, search GitHub Issues for a similar question. If so, please add a 👍 reaction to the existing issue.
14+
15+
- type: textarea
16+
attributes:
17+
label: Question
18+
description: Detailed question
19+
validations:
20+
required: true
21+
22+
- type: textarea
23+
attributes:
24+
label: Module version info
25+
description: Output of `grep 'github.com/essentialkaos/sslscan' go.sum` command
26+
render: shell
27+
validations:
28+
required: true

‎.github/ISSUE_TEMPLATE/suggestion.yml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: ➕ Suggestion
2+
description: Suggest new feature or improvement
3+
title: "[Suggestion]: "
4+
labels: ["issue • suggestion"]
5+
assignees:
6+
- andyone
7+
8+
body:
9+
- type: markdown
10+
attributes:
11+
value: |
12+
> [!IMPORTANT]
13+
> Before you open an issue, search GitHub Issues for a similar feature requests. If so, please add a 👍 reaction to the existing issue.
14+
>
15+
> Opening a feature request kicks off a discussion. Requests may be closed if we're not actively planning to work on them.
16+
17+
- type: textarea
18+
attributes:
19+
label: Proposal
20+
description: Description of the feature
21+
validations:
22+
required: true
23+
24+
- type: textarea
25+
attributes:
26+
label: Current behavior
27+
description: What currently happens
28+
validations:
29+
required: true
30+
31+
- type: textarea
32+
attributes:
33+
label: Desired behavior
34+
description: What you would like to happen
35+
validations:
36+
required: true
37+
38+
- type: textarea
39+
attributes:
40+
label: Use case
41+
description: Why is this important (helps with prioritizing requests)
42+
validations:
43+
required: true

‎.github/dependabot.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ updates:
66
target-branch: "develop"
77
schedule:
88
interval: "daily"
9-
timezone: "Europe/London"
9+
timezone: "Etc/UTC"
1010
time: "03:00"
1111
labels:
1212
- "PR • MAINTENANCE"
@@ -26,8 +26,8 @@ updates:
2626
target-branch: "develop"
2727
schedule:
2828
interval: "daily"
29-
timezone: "Europe/London"
30-
time: "04:00"
29+
timezone: "Etc/UTC"
30+
time: "03:00"
3131
labels:
3232
- "PR • MAINTENANCE"
3333
assignees:

‎.github/images/card.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
strategy:
3939
matrix:
40-
go: [ '1.21.x', '1.22.x' ]
40+
go: [ '1.22.x', '1.23.x' ]
4141

4242
steps:
4343
- name: Checkout

‎Makefile‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
################################################################################
22

3-
# This Makefile generated by GoMakeGen 3.0.2 using next command:
3+
# This Makefile generated by GoMakeGen 3.2.3 using next command:
44
# gomakegen --mod .
55
#
66
# More info: https://kaos.sh/gomakegen
@@ -11,7 +11,16 @@ ifdef VERBOSE ## Print verbose information (Flag)
1111
VERBOSE_FLAG = -v
1212
endif
1313

14-
COMPAT ?= 1.19
14+
ifdef PROXY ## Force proxy usage for downloading dependencies (Flag)
15+
export GOPROXY=https://proxy.golang.org/cached-only,direct
16+
endif
17+
18+
ifdef CGO ## Enable CGO usage (Flag)
19+
export CGO_ENABLED=1
20+
else
21+
export CGO_ENABLED=0
22+
endif
23+
1524
MAKEDIR = $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
1625
GITREV ?= $(shell test -s $(MAKEDIR)/.git && git rev-parse --short HEAD)
1726

@@ -33,25 +42,28 @@ vendor: mod-vendor ## Make vendored copy of dependencies
3342
test: ## Run tests
3443
@echo "Starting tests…"
3544
ifdef COVERAGE_FILE ## Save coverage data into file (String)
36-
@go test $(VERBOSE_FLAG) -covermode=count -coverprofile=$(COVERAGE_FILE) .
45+
@go test $(VERBOSE_FLAG) -covermode=count -coverprofile=$(COVERAGE_FILE) ./.
3746
else
3847
@go test $(VERBOSE_FLAG) -covermode=count .
3948
endif
4049

4150
mod-init:
42-
@echo "[1/2] Modules initialization…"
51+
@echo "[1/3] Modules initialization…"
52+
@rm -f go.mod go.sum
4353
ifdef MODULE_PATH ## Module path for initialization (String)
4454
@go mod init $(MODULE_PATH)
4555
else
4656
@go mod init
4757
endif
4858

49-
@echo "[37m[2/2][0m [36;1mDependencies cleanup…[0m"
59+
@echo "[37m[2/3][0m [36;1mDependencies cleanup…[0m"
5060
ifdef COMPAT ## Compatible Go version (String)
5161
@go mod tidy $(VERBOSE_FLAG) -compat=$(COMPAT) -go=$(COMPAT)
5262
else
5363
@go mod tidy $(VERBOSE_FLAG)
5464
endif
65+
@echo "[3/3] Stripping toolchain info…"
66+
@grep -q 'toolchain ' go.mod && go mod edit -toolchain=none || :
5567

5668
mod-update:
5769
@echo "[1/4] Updating dependencies…"
@@ -97,8 +109,9 @@ help: ## Show this info
97109
@echo -e '\n\033[1mVariables:\033[0m\n'
98110
@grep -E '^ifdef [A-Z_]+ .*?## .*$$' $(abspath $(lastword $(MAKEFILE_LIST))) \
99111
| sed 's/ifdef //' \
112+
| sort -h \
100113
| awk 'BEGIN {FS = " .*?## "}; {printf " \033[32m%-13s\033[0m %s\n", $$1, $$2}'
101114
@echo -e ''
102-
@echo -e '\033[90mGenerated by GoMakeGen 3.0.2\033[0m\n'
115+
@echo -e '\033[90mGenerated by GoMakeGen 3.2.3\033[0m\n'
103116

104117
################################################################################

0 commit comments

Comments
 (0)