Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove go 1.15 support #18511

Merged
merged 2 commits into from
Feb 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions modules/git/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,6 @@ func (c *Command) RunWithContext(rc *RunContext) error {
"GIT_TERMINAL_PROMPT=0",
)

// TODO: verify if this is still needed in golang 1.15
if goVersionLessThan115 {
cmd.Env = append(cmd.Env, "GODEBUG=asyncpreemptoff=1")
}
cmd.Dir = rc.Dir
cmd.Stdout = rc.Stdout
cmd.Stderr = rc.Stderr
Expand Down
11 changes: 0 additions & 11 deletions modules/git/git.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ var (

gitVersion *version.Version

// will be checked on Init
goVersionLessThan115 = true

// SupportProcReceive version >= 2.29.0
SupportProcReceive bool
)
Expand Down Expand Up @@ -156,14 +153,6 @@ func Init(ctx context.Context) error {
return err
}

// Save if the go version used to compile gitea is greater or equal 1.15
runtimeVersion, err := version.NewVersion(strings.TrimPrefix(runtime.Version(), "go"))
if err != nil {
return err
}
version115, _ := version.NewVersion("1.15")
goVersionLessThan115 = runtimeVersion.LessThan(version115)

// Git requires setting user.name and user.email in order to commit changes - if they're not set just add some defaults
for configKey, defaultValue := range map[string]string{"user.name": "Gitea", "user.email": "gitea@fake.local"} {
if err := checkAndSetConfig(configKey, defaultValue, false); err != nil {
Expand Down