From ce003171ea83c22b3740fce1b9b6d0b4f645b58b Mon Sep 17 00:00:00 2001
From: harryzcy <harryzcy@noreply.gitea.io>
Date: Thu, 6 Apr 2023 20:36:14 +0800
Subject: [PATCH] Bump golangci-lint and git version (#21)

This should also fix the CI issue in gitea main repo.

Co-authored-by: harryzcy <harry@harryzheng.com>
Reviewed-on: https://gitea.com/gitea/test-env/pulls/21
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Reviewed-by: John Olheiser <john+gitea@jolheiser.com>
Co-authored-by: harryzcy <harryzcy@noreply.gitea.io>
Co-committed-by: harryzcy <harryzcy@noreply.gitea.io>
---
 .gitea/workflows/build-publish.yaml | 4 ++--
 .gitea/workflows/dry-run.yaml       | 4 ++--
 Dockerfile                          | 4 ++--
 README.md                           | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitea/workflows/build-publish.yaml b/.gitea/workflows/build-publish.yaml
index 289032a..9de971b 100644
--- a/.gitea/workflows/build-publish.yaml
+++ b/.gitea/workflows/build-publish.yaml
@@ -10,8 +10,8 @@ jobs:
       matrix:
         arch: ['ubuntu-latest', 'arm-ubuntu-latest']
         go-version: ['1.19','1.20']
-        git-version: ['2.38.4']
-        golangci-lint-version: ['1.51.2']
+        git-version: ['2.40.0']
+        golangci-lint-version: ['1.52.2']
     runs-on: ${{ matrix.arch }}
     steps:
     - uses: actions/checkout@v3
diff --git a/.gitea/workflows/dry-run.yaml b/.gitea/workflows/dry-run.yaml
index 970dde0..1cb5dde 100644
--- a/.gitea/workflows/dry-run.yaml
+++ b/.gitea/workflows/dry-run.yaml
@@ -7,8 +7,8 @@ jobs:
     strategy:
       matrix:
         go-version: ['1.19','1.20']
-        git-version: ['2.38.4']
-        golangci-lint-version: ['1.51.2']
+        git-version: ['2.40.0']
+        golangci-lint-version: ['1.52.2']
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
diff --git a/Dockerfile b/Dockerfile
index 465f671..d69bb71 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
 ARG GOLANG_VERSION=1.20
 FROM golang:${GOLANG_VERSION}-bullseye
 
-ARG GIT_VERSION=2.38.4
-ARG GOLANGCI_LINT_VERSION=1.51.0
+ARG GIT_VERSION=2.40.0
+ARG GOLANGCI_LINT_VERSION=1.52.2
 
 ARG GITEA_ID=1000
 ARG GITEA_GID=1000
diff --git a/README.md b/README.md
index 67dad16..b2a0989 100644
--- a/README.md
+++ b/README.md
@@ -3,11 +3,11 @@
 A docker image for Gitea ci test
 
 - From golang:1.20
-- upgrade git to v2.38.4
+- upgrade git to v2.40.0
 - install git-lfs
-- install [golangci-lint](https://github.com/golangci/golangci-lint) v1.51.2
+- install [golangci-lint](https://github.com/golangci/golangci-lint) v1.52.2
 
-# development environment build
+## development environment build
 
 In order to run from within a development environment at the root of the gitea repository with a command such as `docker run --volume $(pwd):/drone/src --workdir /drone/src --user gitea mytestenv ...` the id of the gitea user must match the id of the development environment.