Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix update-vendor-hash #791

Merged
merged 5 commits into from
Jun 4, 2024
Merged

fix update-vendor-hash #791

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
42e8520
set go v1.22 for lint
hilmarf Jun 3, 2024
8efb1b2
bump go version for nix flake
hilmarf Jun 3, 2024
4232ea9
bump golangci/golangci-lint
hilmarf Jun 3, 2024
308a5f7
updated the version at the right location
Skarlso Jun 3, 2024
d186909
revert lint changes
hilmarf Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .golangci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
run:
go: "1.21"
go: "1.22"
timeout: 10m
tests: false
allow-parallel-runners: true
Expand Down Expand Up @@ -42,10 +42,10 @@ linters:
- nlreturn # Use empty line at least before return/break/continue.
- goerr113 # Do not define dynamic errors with Errorf.
- varnamelen # m, d, p < These are not so meaningful variables.
- testpackage # Blackbox testing is preffered.
- testpackage # Blackbox testing is preferred.
- funlen # Break long functions.
- gomnd # Give constant values a name with constants.
- ireturn # Accept interface, return concrate.
- ireturn # Accept interface, return concrete.
- nestif # Some nexted if statements are 8 or 9 deep.
- dupl # Check code duplications.
- cyclop # Complex functions are not good.
Expand Down Expand Up @@ -109,9 +109,9 @@ linters-settings:
- prefix(github.com/open-component-model/ocm)
custom-order: true
staticcheck:
go: "1.21"
go: "1.22"
stylecheck:
go: "1.21"
go: "1.22"
funlen:
lines: 110
statements: 60
Expand Down
6 changes: 3 additions & 3 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

inputs = {
# NixPkgs (nixos-23.11)
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
};

outputs = { self, nixpkgs, ... }:
Expand All @@ -28,7 +28,7 @@
inherit (pkgs) stdenv lib ;
in
{
${pname} = pkgs.buildGo121Module rec {
${pname} = pkgs.buildGo122Module rec {
inherit pname self;
version = lib.fileContents ./VERSION;
gitCommit = if (self ? rev) then self.rev else self.dirtyRev;
Expand Down Expand Up @@ -86,7 +86,7 @@
{
default = pkgs.mkShell {
buildInputs = with pkgs; [
go_1_21 # golang 1.21
go_1_22 # golang 1.22
gopls # go language server
gotools # go imports
go-tools # static checks
Expand Down
2 changes: 1 addition & 1 deletion hack/install-requirements.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PROJECT_ROOT="${CURRENT_DIR}"/..

echo "> Install Go packages/binaries"

curl -sfL "https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh" | sh -s -- -b $(go env GOPATH)/bin v1.54.2
curl -sfL "https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh" | sh -s -- -b $(go env GOPATH)/bin v1.58.1

GO111MODULE=off go get -u github.com/go-bindata/go-bindata/...

Expand Down
Loading