Skip to content

Commit

Permalink
Sync with fabricator linter/tools
Browse files Browse the repository at this point in the history
Signed-off-by: Sergei Lukianov <[email protected]>
  • Loading branch information
Frostman committed Feb 12, 2025
1 parent 7168ac6 commit ed16d7d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
uses: golangci/golangci-lint-action@v6
with:
# keep in sync with hack/tools.just
version: v1.61.0
version: v1.64.2

- name: Run tests
run: |
Expand Down
16 changes: 1 addition & 15 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
# Copyright 2023 Hedgehog
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

run:
timeout: 10m
allow-parallel-runners: true
Expand Down Expand Up @@ -60,10 +46,10 @@ linters:
- promlinter
- reassign
- revive
- tenv
- unconvert
- unparam
- usestdlibvars
- usetesting
- whitespace
- wrapcheck

Expand Down
7 changes: 4 additions & 3 deletions hack/tools.just
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ envtest := localbin / "setup-envtest" + "-" + envtest_version
[ -f {{envtest}} ] || just _goinstall "sigs.k8s.io/controller-runtime/tools/setup-envtest" {{envtest_version}} "setup-envtest" {{envtest}}

# golangci-lint, keep version in sync with ci.yaml
golangci_lint_version := "v1.61.0"
golangci_lint_version := "v1.64.2"
golangci_lint := localbin / "golangci-lint" + "-" + golangci_lint_version
@_golangci_lint: _localbin
[ -f {{golangci_lint}} ] || just _goinstall "github.com/golangci/golangci-lint/cmd/golangci-lint" {{golangci_lint_version}} "golangci-lint" {{golangci_lint}}

# butane
butane_version := "v0.22.0"
butane_version := "v0.23.0"
butane := localbin / "butane" + "-" + butane_version
@_butane: _localbin
[ -f {{butane}} ] || just _goinstall "github.com/coreos/butane/internal" {{butane_version}} "internal" {{butane}}
Expand Down Expand Up @@ -138,6 +138,7 @@ test path="./...": gen _envtest _gcov2lcov
oci := ""
skopeo_dest_insecure := if oci == "http" { "--dest-tls-verify=false" } else { "" }
oras_insecure := if oci == "http" { "--plain-http" } else { "" }
helm_insecure_push := if oci == "http" { "--plain-http" } else { "" }

_docker-build bin: build
cp bin/{{bin}} config/docker/{{bin}}/
Expand All @@ -153,7 +154,7 @@ _helm-build name: _helm
{{helm}} lint config/helm/{{name}}-{{version}}.tgz

_helm-push name: _helm
{{helm}} push config/helm/{{name}}-{{version}}.tgz oci://{{oci_repo}}/{{oci_prefix}}/charts
{{helm}} push {{helm_insecure_push}} config/helm/{{name}}-{{version}}.tgz oci://{{oci_repo}}/{{oci_prefix}}/charts

_kube-build name: (_docker-build name) (_helm-build name)

Expand Down

0 comments on commit ed16d7d

Please sign in to comment.