From 2b1201ab72f7f1b7416f39db6445dd4132548b51 Mon Sep 17 00:00:00 2001 From: Michael Lynch Date: Fri, 31 Jul 2026 21:50:10 -0400 Subject: [PATCH 1/2] Upgrade to Go 1.27 --- .circleci/config.yml | 2 +- Dockerfile | 2 +- flake.lock | 8 ++++---- flake.nix | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 544a0d81..ce15d695 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ executors: - image: cimg/base:stable go: docker: - - image: cimg/go:1.26.1 + - image: golang:1.27rc2 jobs: check_whitespace: executor: go diff --git a/Dockerfile b/Dockerfile index 653eed76..5d6e406c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.26.1 AS builder +FROM golang:1.27rc2 AS builder ARG TARGETPLATFORM diff --git a/flake.lock b/flake.lock index 096a7560..46dcbf7a 100644 --- a/flake.lock +++ b/flake.lock @@ -36,17 +36,17 @@ }, "go-nixpkgs": { "locked": { - "lastModified": 1773110118, - "narHash": "sha256-mPAG8phMbCReKSiKAijjjd3v7uVcJOQ75gSjGJjt/Rk=", + "lastModified": 1784783405, + "narHash": "sha256-4IHyyLgLBdKefkljdKod4IMn023pQiDXAWJA187cmdY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e607cb5360ff1234862ac9f8839522becb853bb9", + "rev": "7525d999cd850b9a488817abc89c75dc733acf17", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "e607cb5360ff1234862ac9f8839522becb853bb9", + "rev": "7525d999cd850b9a488817abc89c75dc733acf17", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 629355fe..e0aea9b8 100644 --- a/flake.nix +++ b/flake.nix @@ -7,8 +7,8 @@ # Use https://www.nixhub.io/ to find the exact nixpkgs reference for exact # package versions. - # 1.26.1 release - go-nixpkgs.url = "github:NixOS/nixpkgs/e607cb5360ff1234862ac9f8839522becb853bb9"; + # 1.27rc2 release + go-nixpkgs.url = "github:NixOS/nixpkgs/7525d999cd850b9a488817abc89c75dc733acf17"; # 3.44.2 release sqlite-nixpkgs.url = "github:NixOS/nixpkgs/5ad9903c16126a7d949101687af0aa589b1d7d3d"; @@ -50,7 +50,7 @@ } @ inputs: flake-utils.lib.eachDefaultSystem (system: let gopkg = go-nixpkgs.legacyPackages.${system}; - go = gopkg.go_1_26; + go = gopkg.go_1_27; buildGoModule = gopkg.buildGoModule.override {inherit go;}; sqlite = sqlite-nixpkgs.legacyPackages.${system}.sqlite; nodepkgs = nodejs-nixpkgs.legacyPackages.${system}; From 5c8be89be604c35313c1ebf4f7cdf8fdb0687293 Mon Sep 17 00:00:00 2001 From: Michael Lynch Date: Fri, 31 Jul 2026 21:56:58 -0400 Subject: [PATCH 2/2] Fix go versions --- dev-scripts/run-go-tests | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-scripts/run-go-tests b/dev-scripts/run-go-tests index 1c9282ed..069d6321 100755 --- a/dev-scripts/run-go-tests +++ b/dev-scripts/run-go-tests @@ -54,7 +54,7 @@ fi # Install go-critic if it's not present. GOCRITIC_PATH="$(go env GOBIN)/go-critic" readonly GOCRITIC_PATH -readonly GOCRITIC_VERSION="v0.14.3" +readonly GOCRITIC_VERSION="v0.14.4" if [[ ! -f "${GOCRITIC_PATH}" ]]; then go install "github.com/go-critic/go-critic/cmd/go-critic@${GOCRITIC_VERSION}" fi diff --git a/go.mod b/go.mod index cd02e22e..7196bb02 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/mtlynch/screenjournal/v2 -go 1.26 +go 1.27 require ( codeberg.org/mtlynch/simpleauth/v3 v3.0.0-20260419204402-296b389fc48a