remove options

Author: ExplodingDragon

custom/conf/app.example.ini

@@ -2630,9 +2630,6 @@ LEVEL = Info
 ;LIMIT_SIZE_VAGRANT = -1
 ;; Enable RPM re-signing by default. (It will overwrite the old signature ,using v4 format, not compatible with CentOS 6 or older)
 ;DEFAULT_RPM_SIGN_ENABLED  = false
-;; Only show the latest version in the Arch index.
-;SHOW_LATEST_VERSION_ARCH = false
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; default storage for attachments, lfs and avatars

modules/setting/packages.go

@@ -45,8 +45,6 @@ var (
 		LimitSizeVagrant     int64
 
 		DefaultRPMSignEnabled bool
-
-		ShowLatestVersionArch bool
 	}{
 		Enabled:              true,
 		LimitTotalOwnerCount: -1,
@@ -104,7 +102,6 @@ func loadPackagesFrom(rootCfg ConfigProvider) (err error) {
 	Packages.LimitSizeSwift = mustBytes(sec, "LIMIT_SIZE_SWIFT")
 	Packages.LimitSizeVagrant = mustBytes(sec, "LIMIT_SIZE_VAGRANT")
 	Packages.DefaultRPMSignEnabled = sec.Key("DEFAULT_RPM_SIGN_ENABLED").MustBool(false)
-	Packages.ShowLatestVersionArch = sec.Key("SHOW_LATEST_VERSION_ARCH").MustBool(false)
 	return nil
 }
 

services/packages/arch/repository.go

@@ -23,7 +23,6 @@ import (
 	"code.gitea.io/gitea/modules/json"
 	packages_module "code.gitea.io/gitea/modules/packages"
 	arch_module "code.gitea.io/gitea/modules/packages/arch"
-	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/util"
 	packages_service "code.gitea.io/gitea/services/packages"
 
@@ -246,17 +245,12 @@ func buildPackagesIndex(ctx context.Context, ownerID int64, repoVersion *package
 			return err
 		}
 
-		if setting.Packages.ShowLatestVersionArch {
-			if old, ok := vpfs[current.Version.PackageID]; ok {
-				if compareVersions(old.Version.Version, current.Version.Version) == -1 {
-					vpfs[current.Version.PackageID] = current
-				}
-			} else {
+		if old, ok := vpfs[current.Version.PackageID]; ok {
+			if compareVersions(old.Version.Version, current.Version.Version) == -1 {
 				vpfs[current.Version.PackageID] = current
 			}
 		} else {
-			// keep all files
-			vpfs[current.File.ID] = current
+			vpfs[current.Version.PackageID] = current
 		}
 	}
 

tests/integration/api_packages_arch_test.go

@@ -17,8 +17,6 @@ import (
 	"code.gitea.io/gitea/models/unittest"
 	user_model "code.gitea.io/gitea/models/user"
 	arch_module "code.gitea.io/gitea/modules/packages/arch"
-	"code.gitea.io/gitea/modules/setting"
-	"code.gitea.io/gitea/modules/test"
 	arch_service "code.gitea.io/gitea/services/packages/arch"
 	"code.gitea.io/gitea/tests"
 
@@ -302,7 +300,6 @@ license = MIT`)
 	}
 	t.Run("KeepLastVersion", func(t *testing.T) {
 		defer tests.PrintCurrentTest(t)()
-		defer test.MockVariableValue(&setting.Packages.ShowLatestVersionArch, true)()
 		pkgVer1 := createPackage("gz", "gitea-test", "1.0.0", "aarch64")
 		pkgVer2 := createPackage("gz", "gitea-test", "1.0.1", "aarch64")
 		req := NewRequestWithBody(t, "PUT", rootURL, bytes.NewReader(pkgVer1)).