From 6e984f039c5c3dc5be6b0f2a84733979f815d731 Mon Sep 17 00:00:00 2001 From: Aykhan Shahsuvarov Date: Thu, 3 Sep 2026 12:55:35 +0400 Subject: [PATCH] chore: update Go toolchain and Nix configuration --- .github/workflows/lint.yaml | 2 +- .github/workflows/release.yaml | 4 ++-- Dockerfile | 2 +- README.md | 2 +- Taskfile.yaml | 5 +++-- flake.lock | 6 +++--- flake.nix | 2 +- go.mod | 2 +- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index d5a2fa3..e80bf5b 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v7 - uses: actions/setup-go@v7 with: - go-version: 1.26.5 + go-version-file: go.mod - name: go fix run: | go fix ./... diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7978766..2466deb 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -88,12 +88,12 @@ jobs: run: | echo "VERSION=$(git describe --tags --always)" >> $GITHUB_ENV echo "GIT_COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV - echo "GO_VERSION=1.26.5" >> $GITHUB_ENV + echo "GO_VERSION=$(sed -n 's/^go //p' go.mod)" >> $GITHUB_ENV - name: Set up Go uses: actions/setup-go@v7 with: - go-version: ${{ env.GO_VERSION }} + go-version-file: go.mod cache: true - name: Build binaries diff --git a/Dockerfile b/Dockerfile index a6ab4f3..95ca463 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.26.5 +ARG GO_VERSION=1.26.7 FROM docker.io/library/golang:${GO_VERSION}-alpine AS builder diff --git a/README.md b/README.md index f544121..f512bb8 100644 --- a/README.md +++ b/README.md @@ -96,7 +96,7 @@ Download the latest binaries from the [releases](https://github.com/aykhans/sari
Building from Source -Requires [Go 1.26+](https://golang.org/dl/). +Requires the [Go version declared in `go.mod`](go.mod). ```sh git clone https://github.com/aykhans/sarin.git && cd sarin diff --git a/Taskfile.yaml b/Taskfile.yaml index d811d40..97626b4 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -3,6 +3,8 @@ version: "3" vars: BIN_DIR: ./bin + GO_VERSION: + sh: sed -n 's/^go //p' go.mod GOLANGCI_LINT_VERSION: v2.13.2 GOLANGCI: "{{.BIN_DIR}}/golangci-lint-{{.GOLANGCI_LINT_VERSION}}" @@ -87,7 +89,6 @@ tasks: vars: IMAGE_NAME: '{{.IMAGE_NAME | default "sarin"}}' TAG: '{{.TAG | default "latest"}}' - GO_VERSION: '{{.GO_VERSION | default ""}}' VERSION: sh: git describe --tags --always GIT_COMMIT: @@ -95,7 +96,7 @@ tasks: cmds: - >- docker build - {{if .GO_VERSION}}--build-arg GO_VERSION={{.GO_VERSION}}{{end}} + --build-arg GO_VERSION={{.GO_VERSION}} --build-arg VERSION={{.VERSION}} --build-arg GIT_COMMIT={{.GIT_COMMIT}} -t {{.IMAGE_NAME}}:{{.TAG}} diff --git a/flake.lock b/flake.lock index 0b9301e..4e641bd 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1784796856, - "narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=", + "lastModified": 1788316716, + "narHash": "sha256-bc7rSpXIdn9QWGNqfWcPZWOhEVF8NoeAZkWq0XWnf/k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2587caef70cea85dd97d7daab492899902dbf5d", + "rev": "3ed67ec0a4d3c7ab4ae1f04f8ee8df07bfa506a2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8d3df8b..2744da3 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,7 @@ apps = forAllSystems (pkgs: { default = { type = "app"; - program = "${self.packages.${pkgs.system}.default}/bin/sarin"; + program = "${self.packages.${pkgs.stdenv.hostPlatform.system}.default}/bin/sarin"; meta.description = "High-performance HTTP load testing tool"; }; }); diff --git a/go.mod b/go.mod index 0eb805c..e825cd0 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module go.aykhans.me/sarin -go 1.26.5 +go 1.26.7 require ( charm.land/bubbles/v2 v2.2.1