Skip to content

Commit

Permalink
Merge pull request #1447 from Permify/go-version
Browse files Browse the repository at this point in the history
chore: update Go version to 1.22.6
  • Loading branch information
tolgaOzen authored Aug 8, 2024
2 parents 58cabf1 + 983300e commit 943531b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .air.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ log = "air_errors.log"
# Watch these filename extensions.
include_ext = ["go", "yaml",".env"]
# Ignore these filename extensions or directories.
exclude_dir = ["tmp", "docs"]
exclude_dir = ["tmp", "docs", "playground", "sdk", "assets", "tools"]
# It's not necessary to trigger build each time file changes if it's too frequent.
delay = 500 # ms

Expand Down
5 changes: 3 additions & 2 deletions Dockerfile.local
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM golang:1.22-alpine
# Use the correct Go version
FROM golang:1.22.6-alpine3.20

RUN apk --no-cache add curl
# Install the air binary so we get live code-reloading when we save files
Expand All @@ -7,4 +8,4 @@ RUN curl -sSfL https://raw.githubusercontent.com/cosmtrek/air/master/install.sh
# Run the air command in the directory where our code will live
WORKDIR /app

ENTRYPOINT [ "air" ]
ENTRYPOINT ["air"]
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/Permify/permify

go 1.22.6
go 1.22

require (
github.com/Masterminds/squirrel v1.5.4
Expand Down
4 changes: 2 additions & 2 deletions integration-test/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Step 1: Modules caching
FROM golang:1.20-alpine3.16@sha256:6469405d7297f82d56195c90a3270b0806ef4bd897aa0628477d9959ab97a577 as modules
FROM golang:1.22.6-alpine3.20@sha256:1a478681b671001b7f029f94b5016aed984a23ad99c707f6a0ab6563860ae2f3 as modules
COPY go.mod go.sum /modules/
WORKDIR /modules
RUN go mod download

# Step 2: Tests
FROM golang:1.20-alpine3.16@sha256:6469405d7297f82d56195c90a3270b0806ef4bd897aa0628477d9959ab97a577
FROM golang:1.22.6-alpine3.20@sha256:1a478681b671001b7f029f94b5016aed984a23ad99c707f6a0ab6563860ae2f3
COPY --from=modules /go/pkg /go/pkg
COPY . /app
WORKDIR /app
Expand Down

0 comments on commit 943531b

Please sign in to comment.