Browse Source

feat: compile with Go 1.22 (#568)

Kévin Dunglas 1 year ago
parent
commit
feaa950d89
7 changed files with 9 additions and 5 deletions
  1. 1 1
      .github/workflows/static.yaml
  2. 1 1
      .github/workflows/tests.yaml
  3. 2 0
      caddy/go.mod
  4. 1 1
      dev-alpine.Dockerfile
  5. 1 1
      dev.Dockerfile
  6. 1 1
      docker-bake.hcl
  7. 2 0
      go.mod

+ 1 - 1
.github/workflows/static.yaml

@@ -231,7 +231,7 @@ jobs:
       -
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
           cache-dependency-path: |
             go.sum 
             caddy/go.sum

+ 1 - 1
.github/workflows/tests.yaml

@@ -22,7 +22,7 @@ jobs:
       -
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
           cache-dependency-path: |
             go.sum 
             caddy/go.sum

+ 2 - 0
caddy/go.mod

@@ -2,6 +2,8 @@ module github.com/dunglas/frankenphp/caddy
 
 go 1.21
 
+toolchain go1.22.0
+
 replace github.com/dunglas/frankenphp => ../
 
 retract v1.0.0-rc.1 // Human error

+ 1 - 1
dev-alpine.Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM golang:1.21-alpine
+FROM golang:1.22-alpine
 
 ENV CFLAGS="-ggdb3"
 ENV PHPIZE_DEPS \

+ 1 - 1
dev.Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM golang:1.21
+FROM golang:1.22
 
 ENV CFLAGS="-ggdb3"
 ENV PHPIZE_DEPS \

+ 1 - 1
docker-bake.hcl

@@ -11,7 +11,7 @@ variable "PHP_VERSION" {
 }
 
 variable "GO_VERSION" {
-    default = "1.21"
+    default = "1.22"
 }
 
 variable "SHA" {}

+ 2 - 0
go.mod

@@ -2,6 +2,8 @@ module github.com/dunglas/frankenphp
 
 go 1.21
 
+toolchain go1.22.0
+
 retract v1.0.0-rc.1 // Human error
 
 require (