Merge remote-tracking branch 'origin/master' into jonas-jonas/clientGov1.20.22

Author: jonas-jonas

.docker/Dockerfile-alpine

@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.22
 
 RUN apk add -U --no-cache ca-certificates libssl3 libcrypto3 bash
 

.docker/Dockerfile-build

@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine3.20 AS builder
+FROM golang:1.24-alpine3.22 AS builder
 
 RUN apk -U --no-cache add build-base git gcc bash
 
@@ -7,16 +7,16 @@ WORKDIR /go/src/github.com/ory/cli
 ADD ./go.mod go.mod
 ADD ./go.sum go.sum
 
-ENV GO111MODULE on
-ENV CGO_ENABLED 1
+ENV GO111MODULE=on
+ENV CGO_ENABLED=1
 
 RUN go mod download
 
 ADD . .
 
 RUN CGO_CFLAGS="-D_LARGEFILE64_SOURCE" go build -tags sqlite,json1 -o /usr/bin/ory
 
-FROM alpine:3.20
+FROM alpine:3.22
 
 RUN apk add -U --no-cache ca-certificates bash
 RUN apk upgrade --no-cache libssl3 libcrypto3

.github/workflows/ci.yaml

@@ -16,7 +16,7 @@ jobs:
       - uses: ory/ci/checkout@master
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.23"
+          go-version: "1.24"
       - uses: actions/cache@v4
         with:
           path: |

.github/workflows/format.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.23"
+          go-version: "1.24"
       - run: make format
       - name: Indicate formatting issues
         run: git diff HEAD --exit-code --color

.github/workflows/test-e2e.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: "1.23"
+          go-version: "1.24"
       - uses: actions/setup-node@v2
         with:
           node-version: "16"
@@ -53,7 +53,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: "1.23"
+          go-version: "1.24"
       - uses: actions/setup-node@v2
         with:
           node-version: "16"

.golangci.yml

@@ -1,7 +1,26 @@
+version: "2"
 linters:
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
   enable:
     - goimports
-
-linters-settings:
-  goimports:
-    local-prefixes: github.com/ory
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/ory
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$