Skip to content

Commit

Permalink
fix: nix build, downgrade toolchain to go1.23.1 (#14442)
Browse files Browse the repository at this point in the history
  • Loading branch information
trevorwhitney committed Oct 10, 2024
1 parent edcd09a commit f9213a2
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 17 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/nix-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,30 @@ on:
pull_request:
paths:
- "flake.nix"
- "go.mod"
- "nix/**"
jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v22
- uses: cachix/install-nix-action@v30
with:
nix_path: nixpkgs=channel:nixos-unstable
- run: nix run --print-build-logs .#lint
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v22
- uses: cachix/install-nix-action@v30
with:
nix_path: nixpkgs=channel:nixos-unstable
- run: nix run --print-build-logs .#test
packages:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: cachix/install-nix-action@v22
- uses: cachix/install-nix-action@v30
with:
nix_path: nixpkgs=channel:nixos-unstable
- run: nix build --print-build-logs .#promtail
Expand Down
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/grafana/loki/v3

go 1.22
go 1.23

toolchain go1.23.2
toolchain go1.23.1

require (
cloud.google.com/go/bigtable v1.29.0
Expand Down
8 changes: 4 additions & 4 deletions nix/packages/faillint.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

buildGoModule rec {
pname = "faillint";
version = "1.11.0";
version = "v1.14.0";

src = fetchFromGitHub {
owner = "fatih";
repo = "faillint";
rev = "v${version}";
sha256 = "ZSTeNp8r+Ab315N1eVDbZmEkpQUxmmVovvtqBBskuI4=";
rev = "${version}";
sha256 = "NV+wbu547mtTa6dTGv7poBwWXOmu5YjqbauzolCg5qs=";
};

vendorHash = "sha256-5OR6Ylkx8AnDdtweY1B9OEcIIGWsY8IwTHbR/LGnqFI=";
vendorHash = "sha256-vWt4HneDA7YwXYnn8TbfWCKzSv7RcgXxn/HAh6a+htQ=";
doCheck = false;
}
5 changes: 3 additions & 2 deletions nix/packages/loki.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ let
pname = "lambda-promtail";

src = ./../../tools/lambda-promtail;
vendorHash = "sha256-CKob173T0VHD5c8F26aU7p1l+QzqddNM4qQedMbLJa0=";
vendorHash = "sha256-zEN42vbw4mWtU8KOUi9ZSQiFoRJnH7C04aaZ2wCtA/o=";

doCheck = false;

Expand All @@ -27,8 +27,9 @@ pkgs.stdenv.mkDerivation {
bash
gcc
git
go
go_1_23
golangci-lint
gotools
nettools
yamllint

Expand Down

0 comments on commit f9213a2

Please sign in to comment.