From 617e3ac8c379159229ec8546e9bffb3d632e4bd3 Mon Sep 17 00:00:00 2001 From: eyedeekay Date: Wed, 21 May 2025 13:37:01 -0400 Subject: [PATCH] concatenate required modules to go.mod during build --- .github/workflows/forgejo-build.yml | 3 +-- .github/workflows/forgejo-nightly.yml | 3 +-- .github/workflows/gitea-build.yml | 3 +-- .github/workflows/gitea-nightly.yml | 3 +-- go.mod | 8 -------- 5 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/workflows/forgejo-build.yml b/.github/workflows/forgejo-build.yml index 6c68d8d..ea3915b 100644 --- a/.github/workflows/forgejo-build.yml +++ b/.github/workflows/forgejo-build.yml @@ -80,8 +80,7 @@ jobs: cp -v ../net_mirror_dialer.go modules/graceful/net_mirror_dialer.go cp -v ../net_mirror_unix.go modules/graceful/net_mirror_unix.go cp -v ../net_mirror_windows.go modules/graceful/net_mirror_windows.go - cp -v ../go.mod go.mod - cp -v ../go.sum go.sum + cat ../go.mod >> go.mod go mod tidy make build env: diff --git a/.github/workflows/forgejo-nightly.yml b/.github/workflows/forgejo-nightly.yml index 9ce5460..970d940 100644 --- a/.github/workflows/forgejo-nightly.yml +++ b/.github/workflows/forgejo-nightly.yml @@ -46,8 +46,7 @@ jobs: cp -v ../net_mirror_dialer.go modules/graceful/net_mirror_dialer.go cp -v ../net_mirror_unix.go modules/graceful/net_mirror_unix.go cp -v ../net_mirror_windows.go modules/graceful/net_mirror_windows.go - cp -v ../go.mod go.mod - cp -v ../go.sum go.sum + cat ../go.mod >> go.mod go mod tidy make build env: diff --git a/.github/workflows/gitea-build.yml b/.github/workflows/gitea-build.yml index 3546a70..ffbbeae 100644 --- a/.github/workflows/gitea-build.yml +++ b/.github/workflows/gitea-build.yml @@ -79,8 +79,7 @@ jobs: cp -v ../net_mirror_dialer.go modules/graceful/net_mirror_dialer.go cp -v ../net_mirror_unix.go modules/graceful/net_mirror_unix.go cp -v ../net_mirror_windows.go modules/graceful/net_mirror_windows.go - cp -v ../go.mod go.mod - cp -v ../go.sum go.sum + cat ../go.mod >> go.mod go mod tidy make build env: diff --git a/.github/workflows/gitea-nightly.yml b/.github/workflows/gitea-nightly.yml index cf5eb8d..41b1939 100644 --- a/.github/workflows/gitea-nightly.yml +++ b/.github/workflows/gitea-nightly.yml @@ -41,8 +41,7 @@ jobs: cp -v ../net_mirror_dialer.go modules/graceful/net_mirror_dialer.go cp -v ../net_mirror_unix.go modules/graceful/net_mirror_unix.go cp -v ../net_mirror_windows.go modules/graceful/net_mirror_windows.go - cp -v ../go.mod go.mod - cp -v ../go.sum go.sum + cat ../go.mod >> go.mod go mod tidy make build env: diff --git a/go.mod b/go.mod index 0d6643f..4255dc3 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,3 @@ -module code.gitea.io/gitea - -go 1.24.2 - -// rfc5280 said: "The serial number is an integer assigned by the CA to each certificate." -// But some CAs use negative serial number, just relax the check. related: -// Default TLS cert uses negative serial number #895 https://github.com/microsoft/mssql-docker/issues/895 -godebug x509negativeserial=1 require ( github.com/pkg/errors v0.9.1 // indirect