From 03c21aa689dd9ed6b9d26b388cff162cac1b5b5a Mon Sep 17 00:00:00 2001 From: Michael Lynch Date: Sat, 9 Nov 2024 22:10:00 -0500 Subject: [PATCH] Upgrade to go 1.23.2 (#604) --- .circleci/config.yml | 2 +- Dockerfile | 2 +- dev-scripts/run-go-tests | 2 +- flake.lock | 8 ++++---- flake.nix | 4 ++-- go.mod | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3786fc9e..7757f7d4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ executors: - image: cimg/base:stable go: docker: - - image: cimg/go:1.22.3 + - image: cimg/go:1.23.2 jobs: check_whitespace: executor: base diff --git a/Dockerfile b/Dockerfile index 577cc51f..d05f5453 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.3 AS builder +FROM golang:1.23.2 AS builder ARG TARGETPLATFORM ARG PS_VERSION diff --git a/dev-scripts/run-go-tests b/dev-scripts/run-go-tests index b7a4361a..dfbd88e6 100755 --- a/dev-scripts/run-go-tests +++ b/dev-scripts/run-go-tests @@ -47,7 +47,7 @@ go vet ./... # Install staticcheck if it's not present. STATICCHECK_PATH="$(go env GOPATH)/bin/staticcheck" readonly STATICCHECK_PATH -readonly STATICCHECK_VERSION="v0.4.7" +readonly STATICCHECK_VERSION="v0.5.1" if [[ ! -f "${STATICCHECK_PATH}" ]]; then go install \ -ldflags=-linkmode=external \ diff --git a/flake.lock b/flake.lock index 1de5a021..17420eba 100644 --- a/flake.lock +++ b/flake.lock @@ -36,17 +36,17 @@ }, "go-nixpkgs": { "locked": { - "lastModified": 1718225733, - "narHash": "sha256-aTIpfLT+hQr0H1d7QA2k5a5rWrkL+M8ECN2tI9ClpSg=", + "lastModified": 1730643484, + "narHash": "sha256-FZN70acnL7V0gfmtLTdsi4J1o51bfaBYDTi3E7b7z3U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a9858885e197f984d92d7fe64e9fff6b2e488d40", + "rev": "4ae2e647537bcdbb82265469442713d066675275", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "a9858885e197f984d92d7fe64e9fff6b2e488d40", + "rev": "4ae2e647537bcdbb82265469442713d066675275", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 03d67307..1d6dbf5d 100644 --- a/flake.nix +++ b/flake.nix @@ -4,8 +4,8 @@ inputs = { flake-utils.url = "github:numtide/flake-utils"; - # 1.22.3 release - go-nixpkgs.url = "github:NixOS/nixpkgs/a9858885e197f984d92d7fe64e9fff6b2e488d40"; + # 1.23.2 release + go-nixpkgs.url = "github:NixOS/nixpkgs/4ae2e647537bcdbb82265469442713d066675275"; # 3.44.2 release sqlite-nixpkgs.url = "github:NixOS/nixpkgs/5ad9903c16126a7d949101687af0aa589b1d7d3d"; diff --git a/go.mod b/go.mod index 09d0805e..66cf7170 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/mtlynch/picoshare/v2 -go 1.21 +go 1.23 require ( github.com/go-test/deep v1.1.1