Skip to content

Commit b681f98

Browse files
authored
Merge pull request #2 from cdzombak/cdz/lint
lint
2 parents 7b09c3e + 584d6a4 commit b681f98

6 files changed

Lines changed: 68 additions & 34 deletions

File tree

.github/workflows/main.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,21 @@ jobs:
9696
pull-requests: write
9797
steps:
9898
- name: Checkout
99-
uses: actions/checkout@v4
100-
- name: Super-linter
101-
uses: super-linter/super-linter/slim@v7.4.0
99+
uses: actions/checkout@v4.2.2
100+
- name: Run MegaLinter
101+
uses: oxsecurity/megalinter@e08c2b05e3dbc40af4c23f41172ef1e068a7d651 # v8.8.0
102102
env:
103+
# See https://megalinter.io/configuration and .mega-linter.yml
103104
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
105+
APPLY_FIXES_MODE: commit
106+
- name: Archive MegaLinter artifacts
107+
if: ( !env.ACT && ( success() || failure() ) )
108+
uses: actions/upload-artifact@v4.6.2
109+
with:
110+
name: MegaLinter artifacts
111+
path: |
112+
megalinter-reports
113+
mega-linter.log
104114
105115
docker:
106116
name: Docker Images
@@ -189,7 +199,7 @@ jobs:
189199
uses: actions/checkout@v4
190200

191201
- name: Setup Go
192-
uses: actions/setup-go@v4
202+
uses: actions/setup-go@v5.5.0
193203
with:
194204
go-version: stable
195205
- name: Go version

.mega-linter.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# https://megalinter.io/configuration/
2+
3+
---
4+
APPLY_FIXES: all
5+
6+
DISABLE:
7+
- REPOSITORY
8+
- SPELL
9+
DISABLE_LINTERS:
10+
- MAKEFILE_CHECKMAKE
11+
PLUGINS:
12+
- https://raw.githubusercontent.com/cdzombak/mega-linter-plugin-dockerfilelint/main/mega-linter-plugin-dockerfilelint/dockerfilelint.megalinter-descriptor.yml
13+
14+
GO_REVIVE_CONFIG_FILE: ".revive.toml"
15+
JAVASCRIPT_STANDARD_FILTER_REGEX_EXCLUDE: "blurhash\\.js"
16+
MARKDOWN_MARKDOWNLINT_ARGUMENTS: "--disable MD013"
17+
18+
VALIDATE_ALL_CODEBASE: true
19+
SHOW_ELAPSED_TIME: false
20+
FILEIO_REPORTER: false
21+
PRINT_ALPACA: false

.revive.toml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
ignoreGeneratedHeader = false
2+
severity = "warning"
3+
confidence = 0.8
4+
errorCode = 0
5+
warningCode = 0
6+
7+
[rule.blank-imports]
8+
[rule.context-as-argument]
9+
[rule.context-keys-type]
10+
[rule.dot-imports]
11+
[rule.error-return]
12+
[rule.error-strings]
13+
[rule.error-naming]
14+
[rule.exported]
15+
[rule.if-return]
16+
[rule.increment-decrement]
17+
[rule.var-naming]
18+
[rule.var-declaration]
19+
[rule.package-comments]
20+
Disabled = true
21+
[rule.range]
22+
[rule.receiver-naming]
23+
[rule.time-naming]
24+
[rule.unexported-return]
25+
[rule.indent-error-flow]
26+
[rule.errorf]
27+
[rule.empty-block]
28+
[rule.superfluous-else]
29+
[rule.unused-parameter]
30+
[rule.unreachable-code]
31+
[rule.redefines-builtin-id]

Makefile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,3 @@ lint: ## Lint all source files in this repository (requires nektos/act: https://
5858
.PHONY: update-lint
5959
update-lint: ## Pull updated images supporting the lint target (may fetch >10 GB!)
6060
docker pull catthehacker/ubuntu:full-latest
61-
62-
GOLINT_FILES:=$(shell find . -name '*.go' | grep -v /vendor/)
63-
.PHONY: golint
64-
golint: ## Lint all .go files with golint
65-
@for file in ${GOLINT_FILES} ; do \
66-
echo "$$file" ; \
67-
golint $$file ; \
68-
done

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# gallerygen
2+
13
![gallerygen banner](img/gallerygen-banner.png)
24

35
**gallerygen** generates a static HTML gallery from a directory of images.

gallerygen.go

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
_ "image/gif"
1111
_ "image/jpeg"
1212
_ "image/png"
13-
"io"
1413
"log"
1514
"os"
1615
"os/signal"
@@ -252,27 +251,6 @@ func generateHTML(dir Directory, tmpl *template.Template) error {
252251
return nil
253252
}
254253

255-
func copyFile(src, dst string) error {
256-
sourceFile, err := os.Open(src)
257-
if err != nil {
258-
return err
259-
}
260-
defer sourceFile.Close()
261-
262-
destFile, err := os.Create(dst)
263-
if err != nil {
264-
return err
265-
}
266-
defer destFile.Close()
267-
268-
_, err = io.Copy(destFile, sourceFile)
269-
if err != nil {
270-
return err
271-
}
272-
273-
return destFile.Sync()
274-
}
275-
276254
func watchDirectory(dirPath string, tmpl *template.Template, title string) error {
277255
watcher, err := fsnotify.NewWatcher()
278256
if err != nil {

0 commit comments

Comments
 (0)