Skip to content

Commit a2d02fb

Browse files
committed
Fix linter issues and simplify yaml files
1 parent b7eb482 commit a2d02fb

File tree

5 files changed

+27
-23
lines changed

5 files changed

+27
-23
lines changed

.github/dependabot.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1+
---
12
# See https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
23

34
version: 2
45
updates:
5-
- package-ecosystem: "gomod"
6-
directory: "/"
6+
- package-ecosystem: gomod
7+
directory: /
78
schedule:
8-
interval: "weekly"
9+
interval: weekly
910

10-
- package-ecosystem: "github-actions"
11-
directory: "/"
11+
- package-ecosystem: github-actions
12+
directory: /
1213
schedule:
13-
interval: "weekly"
14+
interval: weekly

.github/workflows/go.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
---
12
name: Go
23

34
on:
45
push:
56
pull_request:
6-
branches: ["main"]
7+
branches: [main]
78
workflow_dispatch:
8-
99
jobs:
1010
test:
1111
name: test
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Go
1717
uses: actions/setup-go@v5
1818
with:
19-
go-version: '1.22.0'
19+
go-version: 1.22.0
2020

2121
- name: Check that all packages are compiling
2222
run: make build
@@ -49,12 +49,12 @@ jobs:
4949
- name: Set up Go
5050
uses: actions/setup-go@v5
5151
with:
52-
go-version: '1.22.0'
52+
go-version: 1.22.0
5353

5454
- name: Check actuality of go.mod and go.sum
5555
run: |
5656
go mod tidy
57-
git diff --exit-code && exit 0 || true
57+
git diff --exit-code && exit 0 || true
5858
echo '######################################################################'
5959
echo
6060
echo "ERROR: go.mod or go.sum is different from the committed version"
@@ -71,7 +71,7 @@ jobs:
7171
- uses: actions/checkout@v4
7272
- uses: actions/setup-go@v5
7373
with:
74-
go-version: '1.22.0'
74+
go-version: 1.22.0
7575
- name: golangci-lint
7676
uses: golangci/golangci-lint-action@v6
7777
with:

.gitlab-ci.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
image: golang:1.22
23

34
stages:
@@ -47,7 +48,7 @@ test:
4748
coverage_report:
4849
coverage_format: cobertura
4950
path: coverage.xml
50-
coverage: '/^total:\s+\(statements\)\s+(\d+(?:\.\d+)?%)/'
51+
coverage: /^total:\s+\(statements\)\s+(\d+(?:\.\d+)?%)/
5152
only:
5253
- branches
5354

@@ -59,13 +60,13 @@ check-go-modules:
5960
script:
6061
- go mod tidy
6162
- |
62-
git diff --exit-code && exit 0 || true
63-
echo -e "\033[0;31m"
64-
echo '######################################################################'
65-
echo
66-
echo "ERROR: go.mod or go.sum is different from the committed version"
67-
echo "Try using 'go mod tidy' to fix the go.mod and go.sum files"
68-
echo "Also, don't forget to commit and push changes"
69-
echo
70-
echo '######################################################################'
63+
git diff --exit-code && exit 0 || true
64+
echo -e "\033[0;31m"
65+
echo '######################################################################'
66+
echo
67+
echo "ERROR: go.mod or go.sum is different from the committed version"
68+
echo "Try using 'go mod tidy' to fix the go.mod and go.sum files"
69+
echo "Also, don't forget to commit and push changes"
70+
echo
71+
echo '######################################################################'
7172
exit 1

.golangci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
linters:
23
disable-all: true
34
enable:

docker-compose.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
version: "3.8"
23

34
services:
@@ -15,7 +16,7 @@ services:
1516
retries: 5
1617
timeout: 5s
1718
ports:
18-
- "32260:5432"
19+
- 32260:5432
1920
volumes:
2021
- ./docker-multiple-databases.sh:/docker-entrypoint-initdb.d/docker-multiple-databases.sh:ro
2122
tmpfs:

0 commit comments

Comments
 (0)