Skip to content

Commit

Permalink
Merge branch 'master' into sandbox-cli-to-ksctl
Browse files Browse the repository at this point in the history
  • Loading branch information
MatousJobanek authored Mar 14, 2024
2 parents 986cb4e + 62336b0 commit c344e65
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 38 deletions.
10 changes: 5 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Set update schedule for GitHub Actions
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions every day
interval: "daily"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions every day
interval: "daily"
4 changes: 2 additions & 2 deletions .github/workflows/ci-check-gomod-alt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ name: ci-check-gomod # same name
on:

Check warning on line 4 in .github/workflows/ci-check-gomod-alt.yml

View workflow job for this annotation

GitHub Actions / YAML Lint

4:1 [truthy] truthy value should be one of [false, true]
pull_request:
paths-ignore:
- 'go.mod'
- 'go.mod'
jobs:
gomodreplacements:
name: go.mod replacements
runs-on: ubuntu-20.04
steps:
- run: 'echo "No check required" '
- run: 'echo "No check required" '
6 changes: 3 additions & 3 deletions .github/workflows/ci-check-gomod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: ci-check-gomod
on:

Check warning on line 2 in .github/workflows/ci-check-gomod.yml

View workflow job for this annotation

GitHub Actions / YAML Lint

2:1 [truthy] truthy value should be one of [false, true]
pull_request:
branches:
- master
- master
paths:
- 'go.mod'
- 'go.mod'

jobs:
gomodreplacements:
Expand All @@ -13,7 +13,7 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: check
run: |
if [[ -n "$(grep 'replace github.com/kubesaw/.*' go.mod || true)" ]]; then
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ name: ci-build
on:

Check warning on line 2 in .github/workflows/workflow.yml

View workflow job for this annotation

GitHub Actions / YAML Lint

2:1 [truthy] truthy value should be one of [false, true]
push:
branches:
- master
- master
tags-ignore:
- '*.*'
- '*.*'
pull_request:
branches:
- master
- master

jobs:
test:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest]
os: [ ubuntu-latest ]

Check warning on line 17 in .github/workflows/workflow.yml

View workflow job for this annotation

GitHub Actions / YAML Lint

17:14 [brackets] too many spaces inside brackets

Check warning on line 17 in .github/workflows/workflow.yml

View workflow job for this annotation

GitHub Actions / YAML Lint

17:28 [brackets] too many spaces inside brackets
name: Test on ${{ matrix.os }}

steps:
Expand Down Expand Up @@ -53,32 +53,32 @@ jobs:
golangci:
name: GolangCI Lint
runs-on: ubuntu-latest

steps:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: 1.20.x

- name: Checkout code
uses: actions/checkout@v4

- name: Lint
uses: golangci/golangci-lint-action@v4
with:
version: v1.56.2
skip-pkg-cache: true
skip-build-cache: true
args: --config=./.golangci.yml --verbose

yammlint:
name: YAML Lint
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Install yamllint
run: pip install yamllint

Expand Down
32 changes: 16 additions & 16 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
service:
project-path: github.com/kubesaw/ksctl
prepare: # see https://github.com/golangci/golangci/wiki/Configuration#config-directives
- make generate
- make generate

run:
# timeout for analysis, e.g. 30s, 5m, default is 1m
Expand All @@ -10,20 +10,20 @@ run:

linters:
enable:
- megacheck
- gocyclo
- gofmt
- revive
- misspell
- gosec
- megacheck
- gocyclo
- gofmt
- revive
- misspell
- gosec
presets: # groups of linters. See https://golangci-lint.run/usage/linters/
- bugs
- unused
disable:
- golint # deprecated, use 'revive'
- scopelint # deprecated, use 'exportloopref'
- contextcheck # too many false-positives
- noctx # not needed
- bugs
- unused
disable:
- golint # deprecated, use 'revive'
- scopelint # deprecated, use 'exportloopref'
- contextcheck # too many false-positives
- noctx # not needed

# all available settings of specific linters
linters-settings:
Expand All @@ -35,5 +35,5 @@ linters-settings:
check-exported: true
revive:
rules:
- name: dot-imports
disabled: true
- name: dot-imports
disabled: true
5 changes: 3 additions & 2 deletions .yamllint
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
ignore: |
/tmp
/.git

rules:
braces: enable
brackets: enable
brackets:
level: warning
colons: enable
commas: enable
comments: disable
Expand Down

0 comments on commit c344e65

Please sign in to comment.