misc(ci): add modernize linter and update versioning (#2870)
* add modernize linter * lint unused * update imports * ignore agent info
This commit is contained in:
124 files changed
+563
-636
No files matched your search
@@ -7,6 +7,12 @@
|
||||
_obj
|
||||
_test
|
||||
.vscode
|
||||
AGENTS.md
|
||||
.claude
|
||||
.agents
|
||||
.claude
|
||||
.copilot
|
||||
.pi
|
||||
|
||||
*.cgo1.go
|
||||
*.cgo2.c
|
||||
|
||||
+2
-1
@@ -12,6 +12,7 @@ linters:
|
||||
- gochecknoinits
|
||||
- gocritic
|
||||
- goprintffuncname
|
||||
- modernize
|
||||
- gosec
|
||||
- govet
|
||||
- ineffassign
|
||||
@@ -93,7 +94,7 @@ formatters:
|
||||
settings:
|
||||
goimports:
|
||||
local-prefixes:
|
||||
- github.com/Jguer/yay/v12
|
||||
- github.com/Jguer/yay/v13
|
||||
exclusions:
|
||||
generated: lax
|
||||
paths:
|
||||
|
||||
@@ -9,11 +9,11 @@ import (
|
||||
mapset "github.com/deckarep/golang-set/v2"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
)
|
||||
|
||||
// CleanDependencies removes all dangling dependencies in system.
|
||||
|
||||
+5
-6
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package main
|
||||
|
||||
@@ -17,11 +16,11 @@ import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db/mock"
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/db/mock"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
)
|
||||
|
||||
func TestCleanHanging(t *testing.T) {
|
||||
|
||||
@@ -5,24 +5,25 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"slices"
|
||||
"strings"
|
||||
|
||||
alpm "github.com/Jguer/dyalpm"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/completion"
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
"github.com/Jguer/yay/v12/pkg/download"
|
||||
"github.com/Jguer/yay/v12/pkg/intrange"
|
||||
"github.com/Jguer/yay/v12/pkg/news"
|
||||
"github.com/Jguer/yay/v12/pkg/query"
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v12/pkg/upgrade"
|
||||
"github.com/Jguer/yay/v12/pkg/vcs"
|
||||
"github.com/Jguer/yay/v13/pkg/completion"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
"github.com/Jguer/yay/v13/pkg/download"
|
||||
"github.com/Jguer/yay/v13/pkg/intrange"
|
||||
"github.com/Jguer/yay/v13/pkg/news"
|
||||
"github.com/Jguer/yay/v13/pkg/query"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/upgrade"
|
||||
"github.com/Jguer/yay/v13/pkg/vcs"
|
||||
)
|
||||
|
||||
func usage(logger *text.Logger) {
|
||||
@@ -412,8 +413,8 @@ func syncList(ctx context.Context, run *runtime.Runtime,
|
||||
) error {
|
||||
aur := false
|
||||
|
||||
for i := len(cmdArgs.Targets) - 1; i >= 0; i-- {
|
||||
if cmdArgs.Targets[i] == "aur" && run.Cfg.Mode.AtLeastAUR() {
|
||||
for i, v := range slices.Backward(cmdArgs.Targets) {
|
||||
if v == "aur" && run.Cfg.Mode.AtLeastAUR() {
|
||||
cmdArgs.Targets = append(cmdArgs.Targets[:i], cmdArgs.Targets[i+1:]...)
|
||||
aur = true
|
||||
}
|
||||
|
||||
+9
-10
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package main
|
||||
|
||||
@@ -16,15 +15,15 @@ import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db/mock"
|
||||
mockaur "github.com/Jguer/yay/v12/pkg/dep/mock"
|
||||
"github.com/Jguer/yay/v12/pkg/query"
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v12/pkg/vcs"
|
||||
"github.com/Jguer/yay/v13/pkg/db/mock"
|
||||
mockaur "github.com/Jguer/yay/v13/pkg/dep/mock"
|
||||
"github.com/Jguer/yay/v13/pkg/query"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/vcs"
|
||||
)
|
||||
|
||||
func TestYogurtMenuAURDB(t *testing.T) {
|
||||
|
||||
@@ -10,10 +10,10 @@ import (
|
||||
"github.com/Jguer/aur"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/download"
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/download"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
// yay -Gp.
|
||||
|
||||
+4
-6
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package main
|
||||
|
||||
@@ -14,10 +13,10 @@ import (
|
||||
"github.com/stretchr/testify/require"
|
||||
gock "gopkg.in/h2non/gock.v1"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
mockaur "github.com/Jguer/yay/v12/pkg/dep/mock"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
mockaur "github.com/Jguer/yay/v13/pkg/dep/mock"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func TestPrintPkgbuilds(t *testing.T) {
|
||||
@@ -43,7 +42,6 @@ func TestPrintPkgbuilds(t *testing.T) {
|
||||
}
|
||||
|
||||
for _, tc := range tests {
|
||||
tc := tc
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
defer gock.Off()
|
||||
gock.New("https://aur.archlinux.org").
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
module github.com/Jguer/yay/v12
|
||||
module github.com/Jguer/yay/v13
|
||||
|
||||
require (
|
||||
github.com/Jguer/aur v1.3.0
|
||||
|
||||
+7
-7
@@ -10,13 +10,13 @@ import (
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
"github.com/Jguer/yay/v12/pkg/dep"
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/sync"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
"github.com/Jguer/yay/v13/pkg/dep"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/sync"
|
||||
|
||||
gosrc "github.com/Morganamilo/go-srcinfo"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package main
|
||||
|
||||
@@ -19,14 +18,14 @@ import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db/mock"
|
||||
mockaur "github.com/Jguer/yay/v12/pkg/dep/mock"
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v12/pkg/vcs"
|
||||
"github.com/Jguer/yay/v13/pkg/db/mock"
|
||||
mockaur "github.com/Jguer/yay/v13/pkg/dep/mock"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/vcs"
|
||||
)
|
||||
|
||||
func newTestLogger() *text.Logger {
|
||||
|
||||
@@ -11,16 +11,16 @@ import (
|
||||
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db/ialpm"
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/lua"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/db/ialpm"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/lua"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
var (
|
||||
yayVersion = "12.6.0" // To be set by compiler.
|
||||
yayVersion = "13.0.0" // To be set by compiler.
|
||||
localePath = "/usr/share/locale" // To be set by compiler.
|
||||
)
|
||||
|
||||
|
||||
@@ -7,12 +7,12 @@ import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db/ialpm"
|
||||
"github.com/Jguer/yay/v12/pkg/dep"
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/db/ialpm"
|
||||
"github.com/Jguer/yay/v13/pkg/dep"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
|
||||
"github.com/Jguer/aur/metadata"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package main
|
||||
|
||||
@@ -14,11 +13,11 @@ import (
|
||||
"github.com/Jguer/aur"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
"github.com/Jguer/yay/v12/pkg/db/mock"
|
||||
"github.com/Jguer/yay/v12/pkg/dep"
|
||||
mockaur "github.com/Jguer/yay/v12/pkg/dep/mock"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
"github.com/Jguer/yay/v13/pkg/db/mock"
|
||||
"github.com/Jguer/yay/v13/pkg/dep"
|
||||
mockaur "github.com/Jguer/yay/v13/pkg/dep/mock"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func TestGraphPackageRequiresSingleTarget(t *testing.T) {
|
||||
|
||||
@@ -8,9 +8,9 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
"github.com/Jguer/yay/v12/pkg/download"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
"github.com/Jguer/yay/v13/pkg/download"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
// NeedsUpdate checks if the completion cache needs to be regenerated.
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package completion
|
||||
|
||||
@@ -15,8 +14,8 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
"github.com/Jguer/yay/v12/pkg/db/mock"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
"github.com/Jguer/yay/v13/pkg/db/mock"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ import (
|
||||
|
||||
alpm "github.com/Jguer/dyalpm"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
type (
|
||||
|
||||
@@ -11,9 +11,9 @@ import (
|
||||
pacmanconf "github.com/Morganamilo/go-pacmanconf"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
type AlpmExecutor struct {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package ialpm
|
||||
|
||||
@@ -12,7 +11,7 @@ import (
|
||||
"github.com/Morganamilo/go-pacmanconf"
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func TestAlpmExecutor(t *testing.T) {
|
||||
|
||||
@@ -3,7 +3,7 @@ package ialpm
|
||||
import (
|
||||
alpm "github.com/Jguer/dyalpm"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
// GetPackageNamesBySource returns package names with and without correspondence in SyncDBS respectively.
|
||||
|
||||
@@ -3,8 +3,8 @@ package mock
|
||||
import (
|
||||
"time"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
|
||||
alpm "github.com/Jguer/dyalpm"
|
||||
)
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@ package dep
|
||||
import (
|
||||
"strings"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
aur "github.com/Jguer/yay/v12/pkg/query"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
aur "github.com/Jguer/yay/v13/pkg/query"
|
||||
)
|
||||
|
||||
func splitDep(dep string) (pkg, mod, ver string) {
|
||||
|
||||
+11
-10
@@ -14,11 +14,11 @@ import (
|
||||
mapset "github.com/deckarep/golang-set/v2"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
"github.com/Jguer/yay/v12/pkg/dep/topo"
|
||||
"github.com/Jguer/yay/v12/pkg/intrange"
|
||||
aur "github.com/Jguer/yay/v12/pkg/query"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
"github.com/Jguer/yay/v13/pkg/dep/topo"
|
||||
"github.com/Jguer/yay/v13/pkg/intrange"
|
||||
aur "github.com/Jguer/yay/v13/pkg/query"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
type InstallInfo struct {
|
||||
@@ -763,18 +763,19 @@ func (g *Grapher) provideMenu(dep string, options []aur.Pkg) *aur.Pkg {
|
||||
return &options[0]
|
||||
}
|
||||
|
||||
str := text.Bold(gotext.Get("There are %[1]d providers available for %[2]s:", size, dep))
|
||||
str += "\n"
|
||||
var str strings.Builder
|
||||
str.WriteString(text.Bold(gotext.Get("There are %[1]d providers available for %[2]s:", size, dep)))
|
||||
str.WriteString("\n")
|
||||
|
||||
size = 1
|
||||
str += g.logger.SprintOperationInfo(gotext.Get("Repository AUR"), "\n ")
|
||||
str.WriteString(g.logger.SprintOperationInfo(gotext.Get("Repository AUR"), "\n "))
|
||||
|
||||
for i := range options {
|
||||
str += fmt.Sprintf("%d) %s ", size, options[i].Name)
|
||||
str.WriteString(fmt.Sprintf("%d) %s ", size, options[i].Name))
|
||||
size++
|
||||
}
|
||||
|
||||
g.logger.OperationInfoln(str)
|
||||
g.logger.OperationInfoln(str.String())
|
||||
|
||||
for {
|
||||
g.logger.Println(gotext.Get("\nEnter a number (default=1): "))
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package dep
|
||||
|
||||
@@ -13,10 +12,10 @@ import (
|
||||
alpm "github.com/Jguer/dyalpm"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db/mock"
|
||||
mockaur "github.com/Jguer/yay/v12/pkg/dep/mock"
|
||||
aur "github.com/Jguer/yay/v12/pkg/query"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/db/mock"
|
||||
mockaur "github.com/Jguer/yay/v13/pkg/dep/mock"
|
||||
aur "github.com/Jguer/yay/v13/pkg/query"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
// benchCase represents a single benchmark scenario with expected results for validation.
|
||||
@@ -323,27 +322,27 @@ func BenchmarkGraphFromTargets_GstreamerGit(b *testing.B) {
|
||||
name: "SingleTarget",
|
||||
targets: []string{"gst-plugins-good-git"},
|
||||
expectedLayers: []map[string]*InstallInfo{
|
||||
{"gst-plugins-good-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: ptrString("gstreamer-git")}},
|
||||
{"gst-plugins-base-libs-git": {Source: AUR, Reason: Dep, Version: "1.24.0.r37-1", AURBase: ptrString("gstreamer-git")}},
|
||||
{"gstreamer-git": {Source: AUR, Reason: Dep, Version: "1.24.0.r37-1", AURBase: ptrString("gstreamer-git")}},
|
||||
{"gst-plugins-good-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: new("gstreamer-git")}},
|
||||
{"gst-plugins-base-libs-git": {Source: AUR, Reason: Dep, Version: "1.24.0.r37-1", AURBase: new("gstreamer-git")}},
|
||||
{"gstreamer-git": {Source: AUR, Reason: Dep, Version: "1.24.0.r37-1", AURBase: new("gstreamer-git")}},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "TwoTargets",
|
||||
targets: []string{"gstreamer-git", "gst-plugins-good-git"},
|
||||
expectedLayers: []map[string]*InstallInfo{
|
||||
{"gst-plugins-good-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: ptrString("gstreamer-git")}},
|
||||
{"gst-plugins-base-libs-git": {Source: AUR, Reason: Dep, Version: "1.24.0.r37-1", AURBase: ptrString("gstreamer-git")}},
|
||||
{"gstreamer-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: ptrString("gstreamer-git")}},
|
||||
{"gst-plugins-good-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: new("gstreamer-git")}},
|
||||
{"gst-plugins-base-libs-git": {Source: AUR, Reason: Dep, Version: "1.24.0.r37-1", AURBase: new("gstreamer-git")}},
|
||||
{"gstreamer-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: new("gstreamer-git")}},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "AllThreeExplicit",
|
||||
targets: []string{"gstreamer-git", "gst-plugins-base-libs-git", "gst-plugins-good-git"},
|
||||
expectedLayers: []map[string]*InstallInfo{
|
||||
{"gst-plugins-good-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: ptrString("gstreamer-git")}},
|
||||
{"gst-plugins-base-libs-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: ptrString("gstreamer-git")}},
|
||||
{"gstreamer-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: ptrString("gstreamer-git")}},
|
||||
{"gst-plugins-good-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: new("gstreamer-git")}},
|
||||
{"gst-plugins-base-libs-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: new("gstreamer-git")}},
|
||||
{"gstreamer-git": {Source: AUR, Reason: Explicit, Version: "1.24.0.r37-1", AURBase: new("gstreamer-git")}},
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -379,8 +378,8 @@ func BenchmarkGraphFromTargets_Jellyfin(b *testing.B) {
|
||||
noDeps: true,
|
||||
noCheckDeps: false,
|
||||
expectedLayers: []map[string]*InstallInfo{
|
||||
{"jellyfin": {Source: AUR, Reason: Explicit, Version: "10.8.8-1", AURBase: ptrString("jellyfin")}},
|
||||
{"dotnet-sdk-6.0": {Source: Sync, Reason: MakeDep, Version: "6.0.100-1", SyncDBName: ptrString("community")}},
|
||||
{"jellyfin": {Source: AUR, Reason: Explicit, Version: "10.8.8-1", AURBase: new("jellyfin")}},
|
||||
{"dotnet-sdk-6.0": {Source: Sync, Reason: MakeDep, Version: "6.0.100-1", SyncDBName: new("community")}},
|
||||
},
|
||||
},
|
||||
{
|
||||
@@ -389,14 +388,14 @@ func BenchmarkGraphFromTargets_Jellyfin(b *testing.B) {
|
||||
noDeps: false,
|
||||
noCheckDeps: false,
|
||||
expectedLayers: []map[string]*InstallInfo{
|
||||
{"jellyfin": {Source: AUR, Reason: Explicit, Version: "10.8.8-1", AURBase: ptrString("jellyfin")}},
|
||||
{"jellyfin": {Source: AUR, Reason: Explicit, Version: "10.8.8-1", AURBase: new("jellyfin")}},
|
||||
{
|
||||
"jellyfin-web": {Source: AUR, Reason: Dep, Version: "10.8.8-1", AURBase: ptrString("jellyfin")},
|
||||
"jellyfin-server": {Source: AUR, Reason: Dep, Version: "10.8.8-1", AURBase: ptrString("jellyfin")},
|
||||
"jellyfin-web": {Source: AUR, Reason: Dep, Version: "10.8.8-1", AURBase: new("jellyfin")},
|
||||
"jellyfin-server": {Source: AUR, Reason: Dep, Version: "10.8.8-1", AURBase: new("jellyfin")},
|
||||
},
|
||||
{
|
||||
"dotnet-sdk-6.0": {Source: Sync, Reason: MakeDep, Version: "6.0.100-1", SyncDBName: ptrString("community")},
|
||||
"dotnet-runtime-6.0": {Source: Sync, Reason: Dep, Version: "6.0.100-1", SyncDBName: ptrString("community")},
|
||||
"dotnet-sdk-6.0": {Source: Sync, Reason: MakeDep, Version: "6.0.100-1", SyncDBName: new("community")},
|
||||
"dotnet-runtime-6.0": {Source: Sync, Reason: Dep, Version: "6.0.100-1", SyncDBName: new("community")},
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -431,24 +430,24 @@ func BenchmarkGraphFromTargets_CephProvides(b *testing.B) {
|
||||
name: "CephBinWithLibsBin",
|
||||
targets: []string{"ceph-bin", "ceph-libs-bin"},
|
||||
expectedLayers: []map[string]*InstallInfo{
|
||||
{"ceph-bin": {Source: AUR, Reason: Explicit, Version: "17.2.6-2", AURBase: ptrString("ceph-bin")}},
|
||||
{"ceph-libs-bin": {Source: AUR, Reason: Explicit, Version: "17.2.6-2", AURBase: ptrString("ceph-bin")}},
|
||||
{"ceph-bin": {Source: AUR, Reason: Explicit, Version: "17.2.6-2", AURBase: new("ceph-bin")}},
|
||||
{"ceph-libs-bin": {Source: AUR, Reason: Explicit, Version: "17.2.6-2", AURBase: new("ceph-bin")}},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "CephOnly",
|
||||
targets: []string{"ceph"},
|
||||
expectedLayers: []map[string]*InstallInfo{
|
||||
{"ceph": {Source: AUR, Reason: Explicit, Version: "17.2.6-2", AURBase: ptrString("ceph")}},
|
||||
{"ceph-libs": {Source: AUR, Reason: Dep, Version: "17.2.6-2", AURBase: ptrString("ceph")}},
|
||||
{"ceph": {Source: AUR, Reason: Explicit, Version: "17.2.6-2", AURBase: new("ceph")}},
|
||||
{"ceph-libs": {Source: AUR, Reason: Dep, Version: "17.2.6-2", AURBase: new("ceph")}},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "CephBinOnly",
|
||||
targets: []string{"ceph-bin"},
|
||||
expectedLayers: []map[string]*InstallInfo{
|
||||
{"ceph-bin": {Source: AUR, Reason: Explicit, Version: "17.2.6-2", AURBase: ptrString("ceph-bin")}},
|
||||
{"ceph-libs": {Source: AUR, Reason: Dep, Version: "17.2.6-2", AURBase: ptrString("ceph")}},
|
||||
{"ceph-bin": {Source: AUR, Reason: Explicit, Version: "17.2.6-2", AURBase: new("ceph-bin")}},
|
||||
{"ceph-libs": {Source: AUR, Reason: Dep, Version: "17.2.6-2", AURBase: new("ceph")}},
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -481,8 +480,8 @@ func BenchmarkGraphFromTargets_AndroidSDK(b *testing.B) {
|
||||
name: "WithJDK",
|
||||
targets: []string{"android-sdk", "jdk11-openjdk"},
|
||||
expectedLayers: []map[string]*InstallInfo{
|
||||
{"android-sdk": {Source: AUR, Reason: Explicit, Version: "26.1.1-2", AURBase: ptrString("android-sdk")}},
|
||||
{"jdk11-openjdk": {Source: Sync, Reason: Explicit, Version: "11.0.12.u7-1", SyncDBName: ptrString("community")}},
|
||||
{"android-sdk": {Source: AUR, Reason: Explicit, Version: "26.1.1-2", AURBase: new("android-sdk")}},
|
||||
{"jdk11-openjdk": {Source: Sync, Reason: Explicit, Version: "11.0.12.u7-1", SyncDBName: new("community")}},
|
||||
},
|
||||
}
|
||||
|
||||
@@ -566,7 +565,7 @@ func BenchmarkGraphDependOn(b *testing.B) {
|
||||
for i := 0; i < b.N; i++ {
|
||||
graph := NewGraph()
|
||||
// Create a chain of 20 dependencies
|
||||
for j := 0; j < 20; j++ {
|
||||
for j := range 20 {
|
||||
_ = graph.DependOn(
|
||||
"pkg"+string(rune('A'+j)),
|
||||
"pkg"+string(rune('A'+j+1)),
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package dep
|
||||
|
||||
@@ -15,10 +14,10 @@ import (
|
||||
mapset "github.com/deckarep/golang-set/v2"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db/mock"
|
||||
mockaur "github.com/Jguer/yay/v12/pkg/dep/mock"
|
||||
"github.com/Jguer/yay/v12/pkg/query"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/db/mock"
|
||||
mockaur "github.com/Jguer/yay/v13/pkg/dep/mock"
|
||||
"github.com/Jguer/yay/v13/pkg/query"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func TestGrapher_GraphFromTargetsBranches(t *testing.T) {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
// Package dep provides tests for tree resolution and parsing using RPC/.SRCINFO metadata
|
||||
// instead of PKGBUILD parsing. These tests validate:
|
||||
@@ -18,10 +17,10 @@ import (
|
||||
aurc "github.com/Jguer/aur"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db/mock"
|
||||
mockaur "github.com/Jguer/yay/v12/pkg/dep/mock"
|
||||
aur "github.com/Jguer/yay/v12/pkg/query"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/db/mock"
|
||||
mockaur "github.com/Jguer/yay/v13/pkg/dep/mock"
|
||||
aur "github.com/Jguer/yay/v13/pkg/query"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
// TestGrapher_ReliableParser_AWSCliGit tests the reliable parsing capability
|
||||
@@ -283,11 +282,11 @@ func TestGrapher_SplitPackages_Clion(t *testing.T) {
|
||||
}}
|
||||
|
||||
installInfos := map[string]*InstallInfo{
|
||||
"clion exp": {Source: AUR, Reason: Explicit, Version: "2025.3.1.1-1", AURBase: ptrString("clion"), LastModified: 1768325120, Maintainer: "Zrax"},
|
||||
"clion-jre exp": {Source: AUR, Reason: Explicit, Version: "2025.3.1.1-1", AURBase: ptrString("clion"), LastModified: 1768325120, Maintainer: "Zrax"},
|
||||
"clion-cmake exp": {Source: AUR, Reason: Explicit, Version: "2025.3.1.1-1", AURBase: ptrString("clion"), LastModified: 1768325120, Maintainer: "Zrax"},
|
||||
"clion-gdb exp": {Source: AUR, Reason: Explicit, Version: "2025.3.1.1-1", AURBase: ptrString("clion"), LastModified: 1768325120, Maintainer: "Zrax"},
|
||||
"clion-lldb exp": {Source: AUR, Reason: Explicit, Version: "2025.3.1.1-1", AURBase: ptrString("clion"), LastModified: 1768325120, Maintainer: "Zrax"},
|
||||
"clion exp": {Source: AUR, Reason: Explicit, Version: "2025.3.1.1-1", AURBase: new("clion"), LastModified: 1768325120, Maintainer: "Zrax"},
|
||||
"clion-jre exp": {Source: AUR, Reason: Explicit, Version: "2025.3.1.1-1", AURBase: new("clion"), LastModified: 1768325120, Maintainer: "Zrax"},
|
||||
"clion-cmake exp": {Source: AUR, Reason: Explicit, Version: "2025.3.1.1-1", AURBase: new("clion"), LastModified: 1768325120, Maintainer: "Zrax"},
|
||||
"clion-gdb exp": {Source: AUR, Reason: Explicit, Version: "2025.3.1.1-1", AURBase: new("clion"), LastModified: 1768325120, Maintainer: "Zrax"},
|
||||
"clion-lldb exp": {Source: AUR, Reason: Explicit, Version: "2025.3.1.1-1", AURBase: new("clion"), LastModified: 1768325120, Maintainer: "Zrax"},
|
||||
}
|
||||
|
||||
tests := []struct {
|
||||
@@ -567,11 +566,11 @@ func TestGrapher_SplitPackages_NX(t *testing.T) {
|
||||
}}
|
||||
|
||||
installInfos := map[string]*InstallInfo{
|
||||
"nxproxy exp": {Source: AUR, Reason: Explicit, Version: "3.5.99.27-3", AURBase: ptrString("nx"), LastModified: 1693834449, Maintainer: "harrietobrien"},
|
||||
"nxagent exp": {Source: AUR, Reason: Explicit, Version: "3.5.99.27-3", AURBase: ptrString("nx"), LastModified: 1693834449, Maintainer: "harrietobrien"},
|
||||
"nx-x11 dep": {Source: AUR, Reason: Dep, Version: "3.5.99.27-3", AURBase: ptrString("nx"), LastModified: 1693834449, Maintainer: "harrietobrien"},
|
||||
"libxcomp dep": {Source: AUR, Reason: Dep, Version: "3.5.99.27-3", AURBase: ptrString("nx"), LastModified: 1693834449, Maintainer: "harrietobrien"},
|
||||
"libxcomp exp": {Source: AUR, Reason: Explicit, Version: "3.5.99.27-3", AURBase: ptrString("nx"), LastModified: 1693834449, Maintainer: "harrietobrien"},
|
||||
"nxproxy exp": {Source: AUR, Reason: Explicit, Version: "3.5.99.27-3", AURBase: new("nx"), LastModified: 1693834449, Maintainer: "harrietobrien"},
|
||||
"nxagent exp": {Source: AUR, Reason: Explicit, Version: "3.5.99.27-3", AURBase: new("nx"), LastModified: 1693834449, Maintainer: "harrietobrien"},
|
||||
"nx-x11 dep": {Source: AUR, Reason: Dep, Version: "3.5.99.27-3", AURBase: new("nx"), LastModified: 1693834449, Maintainer: "harrietobrien"},
|
||||
"libxcomp dep": {Source: AUR, Reason: Dep, Version: "3.5.99.27-3", AURBase: new("nx"), LastModified: 1693834449, Maintainer: "harrietobrien"},
|
||||
"libxcomp exp": {Source: AUR, Reason: Explicit, Version: "3.5.99.27-3", AURBase: new("nx"), LastModified: 1693834449, Maintainer: "harrietobrien"},
|
||||
}
|
||||
|
||||
tests := []struct {
|
||||
|
||||
+31
-36
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package dep
|
||||
|
||||
@@ -18,17 +17,13 @@ import (
|
||||
mapset "github.com/deckarep/golang-set/v2"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
"github.com/Jguer/yay/v12/pkg/db/mock"
|
||||
mockaur "github.com/Jguer/yay/v12/pkg/dep/mock"
|
||||
aur "github.com/Jguer/yay/v12/pkg/query"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
"github.com/Jguer/yay/v13/pkg/db/mock"
|
||||
mockaur "github.com/Jguer/yay/v13/pkg/dep/mock"
|
||||
aur "github.com/Jguer/yay/v13/pkg/query"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func ptrString(s string) *string {
|
||||
return &s
|
||||
}
|
||||
|
||||
func getFromFile(t testing.TB, filePath string) mockaur.GetFunc {
|
||||
t.Helper()
|
||||
f, err := os.Open(filePath)
|
||||
@@ -165,7 +160,7 @@ func TestGrapher_GraphFromTargets_jellyfin(t *testing.T) {
|
||||
Source: AUR,
|
||||
Reason: Explicit,
|
||||
Version: "10.8.8-1",
|
||||
AURBase: ptrString("jellyfin"),
|
||||
AURBase: new("jellyfin"),
|
||||
LastModified: 1669830147,
|
||||
Maintainer: "z3ntu",
|
||||
},
|
||||
@@ -175,7 +170,7 @@ func TestGrapher_GraphFromTargets_jellyfin(t *testing.T) {
|
||||
Source: Sync,
|
||||
Reason: MakeDep,
|
||||
Version: "6.0.100-1",
|
||||
SyncDBName: ptrString("community"),
|
||||
SyncDBName: new("community"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -198,7 +193,7 @@ func TestGrapher_GraphFromTargets_jellyfin(t *testing.T) {
|
||||
Source: AUR,
|
||||
Reason: Explicit,
|
||||
Version: "10.8.8-1",
|
||||
AURBase: ptrString("jellyfin"),
|
||||
AURBase: new("jellyfin"),
|
||||
LastModified: 1669830147,
|
||||
Maintainer: "z3ntu",
|
||||
},
|
||||
@@ -208,7 +203,7 @@ func TestGrapher_GraphFromTargets_jellyfin(t *testing.T) {
|
||||
Source: AUR,
|
||||
Reason: Dep,
|
||||
Version: "10.8.8-1",
|
||||
AURBase: ptrString("jellyfin"),
|
||||
AURBase: new("jellyfin"),
|
||||
LastModified: 1669830147,
|
||||
Maintainer: "z3ntu",
|
||||
},
|
||||
@@ -216,7 +211,7 @@ func TestGrapher_GraphFromTargets_jellyfin(t *testing.T) {
|
||||
Source: AUR,
|
||||
Reason: Dep,
|
||||
Version: "10.8.8-1",
|
||||
AURBase: ptrString("jellyfin"),
|
||||
AURBase: new("jellyfin"),
|
||||
LastModified: 1669830147,
|
||||
Maintainer: "z3ntu",
|
||||
},
|
||||
@@ -226,13 +221,13 @@ func TestGrapher_GraphFromTargets_jellyfin(t *testing.T) {
|
||||
Source: Sync,
|
||||
Reason: MakeDep,
|
||||
Version: "6.0.100-1",
|
||||
SyncDBName: ptrString("community"),
|
||||
SyncDBName: new("community"),
|
||||
},
|
||||
"dotnet-runtime-6.0": {
|
||||
Source: Sync,
|
||||
Reason: Dep,
|
||||
Version: "6.0.100-1",
|
||||
SyncDBName: ptrString("community"),
|
||||
SyncDBName: new("community"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -340,7 +335,7 @@ func TestGrapher_GraphProvides_androidsdk(t *testing.T) {
|
||||
Source: AUR,
|
||||
Reason: Explicit,
|
||||
Version: "26.1.1-2",
|
||||
AURBase: ptrString("android-sdk"),
|
||||
AURBase: new("android-sdk"),
|
||||
LastModified: 1647982720,
|
||||
Maintainer: "dreamingincode",
|
||||
},
|
||||
@@ -350,7 +345,7 @@ func TestGrapher_GraphProvides_androidsdk(t *testing.T) {
|
||||
Source: Sync,
|
||||
Reason: Explicit,
|
||||
Version: "11.0.12.u7-1",
|
||||
SyncDBName: ptrString("community"),
|
||||
SyncDBName: new("community"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -455,31 +450,31 @@ func TestGrapher_GraphFromAUR_Deps_ceph_bin(t *testing.T) {
|
||||
Source: AUR,
|
||||
Reason: Explicit,
|
||||
Version: "17.2.6-2",
|
||||
AURBase: ptrString("ceph-bin"),
|
||||
AURBase: new("ceph-bin"),
|
||||
},
|
||||
"ceph-libs-bin exp": {
|
||||
Source: AUR,
|
||||
Reason: Explicit,
|
||||
Version: "17.2.6-2",
|
||||
AURBase: ptrString("ceph-bin"),
|
||||
AURBase: new("ceph-bin"),
|
||||
},
|
||||
"ceph exp": {
|
||||
Source: AUR,
|
||||
Reason: Explicit,
|
||||
Version: "17.2.6-2",
|
||||
AURBase: ptrString("ceph"),
|
||||
AURBase: new("ceph"),
|
||||
},
|
||||
"ceph-libs exp": {
|
||||
Source: AUR,
|
||||
Reason: Explicit,
|
||||
Version: "17.2.6-2",
|
||||
AURBase: ptrString("ceph"),
|
||||
AURBase: new("ceph"),
|
||||
},
|
||||
"ceph-libs dep": {
|
||||
Source: AUR,
|
||||
Reason: Dep,
|
||||
Version: "17.2.6-2",
|
||||
AURBase: ptrString("ceph"),
|
||||
AURBase: new("ceph"),
|
||||
},
|
||||
}
|
||||
|
||||
@@ -644,25 +639,25 @@ func TestGrapher_GraphFromAUR_Deps_gourou(t *testing.T) {
|
||||
Source: AUR,
|
||||
Reason: Explicit,
|
||||
Version: "0.8.1",
|
||||
AURBase: ptrString("gourou"),
|
||||
AURBase: new("gourou"),
|
||||
},
|
||||
"libzip dep": {
|
||||
Source: Sync,
|
||||
Reason: Dep,
|
||||
Version: "1.9.2-1",
|
||||
SyncDBName: ptrString("extra"),
|
||||
SyncDBName: new("extra"),
|
||||
},
|
||||
"libzip exp": {
|
||||
Source: Sync,
|
||||
Reason: Explicit,
|
||||
Version: "1.9.2-1",
|
||||
SyncDBName: ptrString("extra"),
|
||||
SyncDBName: new("extra"),
|
||||
},
|
||||
"libzip-git exp": {
|
||||
Source: AUR,
|
||||
Reason: Explicit,
|
||||
Version: "1.9.2.r159.gb3ac716c-1",
|
||||
AURBase: ptrString("libzip-git"),
|
||||
AURBase: new("libzip-git"),
|
||||
},
|
||||
}
|
||||
|
||||
@@ -814,13 +809,13 @@ func TestGrapher_GraphFromTargets_ReinstalledDeps(t *testing.T) {
|
||||
Source: AUR,
|
||||
Reason: Dep,
|
||||
Version: "0.8.1",
|
||||
AURBase: ptrString("gourou"),
|
||||
AURBase: new("gourou"),
|
||||
},
|
||||
"libzip dep": {
|
||||
Source: Sync,
|
||||
Reason: Dep,
|
||||
Version: "1.9.2-1",
|
||||
SyncDBName: ptrString("extra"),
|
||||
SyncDBName: new("extra"),
|
||||
},
|
||||
}
|
||||
|
||||
@@ -926,7 +921,7 @@ func TestGrapher_GraphFromTargets_TargetNotFound(t *testing.T) {
|
||||
Source: AUR,
|
||||
Reason: Explicit,
|
||||
Version: "1.0.0",
|
||||
AURBase: ptrString("okpkg"),
|
||||
AURBase: new("okpkg"),
|
||||
},
|
||||
},
|
||||
}, layers, layers)
|
||||
@@ -1028,7 +1023,7 @@ func TestGrapher_GraphFromAUR_SplitPkgInternalDeps(t *testing.T) {
|
||||
Source: AUR,
|
||||
Reason: Explicit,
|
||||
Version: "1.24.0.r37-1",
|
||||
AURBase: ptrString("gstreamer-git"),
|
||||
AURBase: new("gstreamer-git"),
|
||||
LastModified: 1700000000,
|
||||
Maintainer: "testmaint",
|
||||
},
|
||||
@@ -1036,7 +1031,7 @@ func TestGrapher_GraphFromAUR_SplitPkgInternalDeps(t *testing.T) {
|
||||
Source: AUR,
|
||||
Reason: Dep,
|
||||
Version: "1.24.0.r37-1",
|
||||
AURBase: ptrString("gstreamer-git"),
|
||||
AURBase: new("gstreamer-git"),
|
||||
LastModified: 1700000000,
|
||||
Maintainer: "testmaint",
|
||||
},
|
||||
@@ -1044,7 +1039,7 @@ func TestGrapher_GraphFromAUR_SplitPkgInternalDeps(t *testing.T) {
|
||||
Source: AUR,
|
||||
Reason: Explicit,
|
||||
Version: "1.24.0.r37-1",
|
||||
AURBase: ptrString("gstreamer-git"),
|
||||
AURBase: new("gstreamer-git"),
|
||||
LastModified: 1700000000,
|
||||
Maintainer: "testmaint",
|
||||
},
|
||||
@@ -1052,7 +1047,7 @@ func TestGrapher_GraphFromAUR_SplitPkgInternalDeps(t *testing.T) {
|
||||
Source: AUR,
|
||||
Reason: Dep,
|
||||
Version: "1.24.0.r37-1",
|
||||
AURBase: ptrString("gstreamer-git"),
|
||||
AURBase: new("gstreamer-git"),
|
||||
LastModified: 1700000000,
|
||||
Maintainer: "testmaint",
|
||||
},
|
||||
@@ -1060,7 +1055,7 @@ func TestGrapher_GraphFromAUR_SplitPkgInternalDeps(t *testing.T) {
|
||||
Source: AUR,
|
||||
Reason: Explicit,
|
||||
Version: "1.24.0.r37-1",
|
||||
AURBase: ptrString("gstreamer-git"),
|
||||
AURBase: new("gstreamer-git"),
|
||||
LastModified: 1700000000,
|
||||
Maintainer: "testmaint",
|
||||
},
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package dep
|
||||
|
||||
@@ -15,11 +14,11 @@ import (
|
||||
gosrc "github.com/Morganamilo/go-srcinfo"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
"github.com/Jguer/yay/v12/pkg/db/mock"
|
||||
mockaur "github.com/Jguer/yay/v12/pkg/dep/mock"
|
||||
"github.com/Jguer/yay/v12/pkg/dep/topo"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
"github.com/Jguer/yay/v13/pkg/db/mock"
|
||||
mockaur "github.com/Jguer/yay/v13/pkg/dep/mock"
|
||||
"github.com/Jguer/yay/v13/pkg/dep/topo"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func TestDepSplitDep(t *testing.T) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package dep
|
||||
|
||||
import "github.com/Jguer/yay/v12/pkg/text"
|
||||
import "github.com/Jguer/yay/v13/pkg/text"
|
||||
|
||||
type Target struct {
|
||||
DB string
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package topo
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ import (
|
||||
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package download
|
||||
|
||||
@@ -13,7 +12,7 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
)
|
||||
|
||||
const gitExtrasPKGBUILD = `pkgname=git-extras
|
||||
|
||||
+2
-2
@@ -15,8 +15,8 @@ import (
|
||||
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func AURPKGBUILD(httpClient HTTPRequestDoer, pkgName, aurURL string) ([]byte, error) {
|
||||
|
||||
@@ -17,8 +17,8 @@ import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
// WHEN some AUR bases exist and others are fresh
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package download
|
||||
|
||||
@@ -13,7 +12,7 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
)
|
||||
|
||||
func TestGetAURPkgbuild(t *testing.T) {
|
||||
|
||||
@@ -12,10 +12,10 @@ import (
|
||||
|
||||
"github.com/Jguer/aur"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
// HTTPRequestDoer is an interface for HTTP clients that can perform GET requests.
|
||||
|
||||
@@ -15,10 +15,10 @@ import (
|
||||
|
||||
"github.com/Jguer/aur"
|
||||
|
||||
mockaur "github.com/Jguer/yay/v12/pkg/dep/mock"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
mockaur "github.com/Jguer/yay/v13/pkg/dep/mock"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func integrationCmdBuilder(t *testing.T) (*text.Logger, *exe.CmdBuilder) {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package download
|
||||
|
||||
@@ -17,10 +16,10 @@ import (
|
||||
|
||||
"github.com/Jguer/aur"
|
||||
|
||||
mockaur "github.com/Jguer/yay/v12/pkg/dep/mock"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
mockaur "github.com/Jguer/yay/v13/pkg/dep/mock"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func newTestLogger() *text.Logger {
|
||||
|
||||
@@ -12,9 +12,9 @@ import (
|
||||
|
||||
alpm "github.com/Jguer/dyalpm"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
"github.com/Jguer/yay/v12/pkg/db/mock"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
"github.com/Jguer/yay/v13/pkg/db/mock"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
)
|
||||
|
||||
type testRunner struct{}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package intrange
|
||||
|
||||
|
||||
@@ -9,9 +9,9 @@ import (
|
||||
mapset "github.com/deckarep/golang-set/v2"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func anyExistInCache(pkgbuildDirs map[string]string) bool {
|
||||
|
||||
@@ -11,10 +11,10 @@ import (
|
||||
mapset "github.com/deckarep/golang-set/v2"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package menus
|
||||
|
||||
@@ -15,10 +14,10 @@ import (
|
||||
mapset "github.com/deckarep/golang-set/v2"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func TestEditor(t *testing.T) {
|
||||
|
||||
@@ -14,9 +14,9 @@ import (
|
||||
mapset "github.com/deckarep/golang-set/v2"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
// Editor returns the preferred system editor.
|
||||
|
||||
+11
-10
@@ -3,12 +3,13 @@ package menus
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/intrange"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/intrange"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
|
||||
mapset "github.com/deckarep/golang-set/v2"
|
||||
)
|
||||
@@ -16,26 +17,26 @@ import (
|
||||
func pkgbuildNumberMenu(logger *text.Logger, pkgbuildDirs map[string]string,
|
||||
bases []string, installed mapset.Set[string],
|
||||
) {
|
||||
toPrint := ""
|
||||
var toPrint strings.Builder
|
||||
|
||||
for n, pkgBase := range bases {
|
||||
dir := pkgbuildDirs[pkgBase]
|
||||
toPrint += fmt.Sprintf(text.Magenta("%3d")+" %-40s", len(pkgbuildDirs)-n,
|
||||
text.Bold(pkgBase))
|
||||
toPrint.WriteString(fmt.Sprintf(text.Magenta("%3d")+" %-40s", len(pkgbuildDirs)-n,
|
||||
text.Bold(pkgBase)))
|
||||
|
||||
if installed.Contains(pkgBase) {
|
||||
toPrint += text.Bold(text.Green(gotext.Get(" (Installed)")))
|
||||
toPrint.WriteString(text.Bold(text.Green(gotext.Get(" (Installed)"))))
|
||||
}
|
||||
|
||||
// TODO: remove or refactor to check if git dir is unclean
|
||||
if _, err := os.Stat(dir); !os.IsNotExist(err) {
|
||||
toPrint += text.Bold(text.Green(gotext.Get(" (Build Files Exist)")))
|
||||
toPrint.WriteString(text.Bold(text.Green(gotext.Get(" (Build Files Exist)"))))
|
||||
}
|
||||
|
||||
toPrint += "\n"
|
||||
toPrint.WriteString("\n")
|
||||
}
|
||||
|
||||
logger.Print(toPrint)
|
||||
logger.Print(toPrint.String())
|
||||
}
|
||||
|
||||
func selectionMenu(logger *text.Logger, pkgbuildDirs map[string]string, bases []string, installed mapset.Set[string],
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package menus
|
||||
|
||||
@@ -14,8 +13,8 @@ import (
|
||||
mapset "github.com/deckarep/golang-set/v2"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func TestSelectionMenu(t *testing.T) {
|
||||
|
||||
+4
-3
@@ -7,10 +7,11 @@ import (
|
||||
"html"
|
||||
"io"
|
||||
"net/http"
|
||||
"slices"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
type item struct {
|
||||
@@ -86,8 +87,8 @@ func PrintNewsFeed(ctx context.Context, client *http.Client, logger *text.Logger
|
||||
}
|
||||
|
||||
if bottomUp {
|
||||
for i := len(rssGot.Channel.Items) - 1; i >= 0; i-- {
|
||||
rssGot.Channel.Items[i].printNews(logger, cutOffDate, all, quiet)
|
||||
for _, v := range slices.Backward(rssGot.Channel.Items) {
|
||||
v.printNews(logger, cutOffDate, all, quiet)
|
||||
}
|
||||
} else {
|
||||
for i := 0; i < len(rssGot.Channel.Items); i++ {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package news
|
||||
|
||||
@@ -16,7 +15,7 @@ import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
"gopkg.in/h2non/gock.v1"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
const lastNews = `
|
||||
|
||||
@@ -8,8 +8,8 @@ import (
|
||||
"github.com/Jguer/aur"
|
||||
alpm "github.com/Jguer/dyalpm"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
type AURWarnings struct {
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@ package query
|
||||
import (
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func RemoveInvalidTargets(logger *text.Logger, targets []string, mode parser.TargetMode) []string {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package query
|
||||
|
||||
|
||||
@@ -15,11 +15,11 @@ import (
|
||||
mapset "github.com/deckarep/golang-set/v2"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
"github.com/Jguer/yay/v12/pkg/intrange"
|
||||
settingslua "github.com/Jguer/yay/v12/pkg/settings/lua"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
"github.com/Jguer/yay/v13/pkg/intrange"
|
||||
settingslua "github.com/Jguer/yay/v13/pkg/settings/lua"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
type SearchVerbosity int
|
||||
|
||||
@@ -7,9 +7,9 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
settingslua "github.com/Jguer/yay/v12/pkg/settings/lua"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
settingslua "github.com/Jguer/yay/v13/pkg/settings/lua"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
// BenchmarkApplySearchFilter_noLua measures applySearchFilter when no Lua
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package query
|
||||
|
||||
@@ -8,9 +7,9 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
settingslua "github.com/Jguer/yay/v12/pkg/settings/lua"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
settingslua "github.com/Jguer/yay/v13/pkg/settings/lua"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package query
|
||||
|
||||
@@ -12,10 +11,10 @@ import (
|
||||
|
||||
"github.com/Jguer/aur"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db/mock"
|
||||
mockaur "github.com/Jguer/yay/v12/pkg/dep/mock"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/db/mock"
|
||||
mockaur "github.com/Jguer/yay/v13/pkg/dep/mock"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
+2
-2
@@ -8,8 +8,8 @@ import (
|
||||
alpm "github.com/Jguer/dyalpm"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
type Pkg = aur.Pkg
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"strings"
|
||||
"unicode"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
|
||||
alpm "github.com/Jguer/dyalpm"
|
||||
)
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package query
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func TestVersionDiff(t *testing.T) {
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"fmt"
|
||||
"os"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
|
||||
pacmanconf "github.com/Morganamilo/go-pacmanconf"
|
||||
"golang.org/x/term"
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package runtime
|
||||
|
||||
@@ -13,7 +12,7 @@ import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
)
|
||||
|
||||
// normalizePath removes trailing slashes from paths (except for root "/").
|
||||
|
||||
@@ -10,13 +10,13 @@ import (
|
||||
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/query"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
settingslua "github.com/Jguer/yay/v12/pkg/settings/lua"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v12/pkg/vcs"
|
||||
"github.com/Jguer/yay/v13/pkg/query"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
settingslua "github.com/Jguer/yay/v13/pkg/settings/lua"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/vcs"
|
||||
|
||||
"github.com/Jguer/aur"
|
||||
"github.com/Jguer/aur/metadata"
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package runtime_test
|
||||
|
||||
@@ -12,10 +11,10 @@ import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db/mock"
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/db/mock"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
)
|
||||
|
||||
func TestBuildRuntime(t *testing.T) {
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
)
|
||||
|
||||
func (c *Configuration) ParseCommandLine(a *parser.Arguments) error {
|
||||
|
||||
@@ -9,8 +9,8 @@ import (
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
|
||||
"github.com/leonelquinteros/gotext"
|
||||
)
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package settings
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package settings
|
||||
|
||||
|
||||
@@ -15,9 +15,9 @@ import (
|
||||
mapset "github.com/deckarep/golang-set/v2"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
const SudoLoopDuration = 241
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package exe
|
||||
|
||||
@@ -12,8 +11,8 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func TestBuildGitCmd(t *testing.T) {
|
||||
|
||||
@@ -7,7 +7,7 @@ import (
|
||||
"strings"
|
||||
"syscall"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
type Runner interface {
|
||||
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
"os/exec"
|
||||
"sync"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
)
|
||||
|
||||
type Call struct {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package exe
|
||||
|
||||
@@ -12,7 +11,7 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func TestOSRunnerCapture(t *testing.T) {
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
// Load loads path, applies its yay.opt values onto cfg, and returns the live engine.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package lua
|
||||
|
||||
import (
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
|
||||
glua "github.com/yuin/gopher-lua"
|
||||
)
|
||||
|
||||
@@ -7,7 +7,7 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func withColorDisabled(t *testing.T) {
|
||||
|
||||
@@ -5,7 +5,7 @@ import (
|
||||
"fmt"
|
||||
"reflect"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
|
||||
lua "github.com/yuin/gopher-lua"
|
||||
)
|
||||
|
||||
@@ -3,8 +3,8 @@ package settings
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
|
||||
"github.com/leonelquinteros/gotext"
|
||||
)
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package settings
|
||||
|
||||
@@ -13,7 +12,7 @@ import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func newTestLogger() *text.Logger {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package parser
|
||||
|
||||
|
||||
+11
-10
@@ -6,14 +6,15 @@ import (
|
||||
"fmt"
|
||||
"maps"
|
||||
"os"
|
||||
"slices"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
"github.com/Jguer/yay/v12/pkg/dep"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v12/pkg/vcs"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
"github.com/Jguer/yay/v13/pkg/dep"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/vcs"
|
||||
|
||||
mapset "github.com/deckarep/golang-set/v2"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
@@ -109,9 +110,9 @@ func (installer *Installer) Install(ctx context.Context,
|
||||
|
||||
// Reorganize targets into layers of dependencies
|
||||
var errs []error
|
||||
for i := len(targets) - 1; i >= 0; i-- {
|
||||
for i, v := range slices.Backward(targets) {
|
||||
lastLayer := i == 0
|
||||
errI := installer.handleLayer(ctx, cmdArgs, targets[i], pkgBuildDirs, lastLayer, excluded)
|
||||
errI := installer.handleLayer(ctx, cmdArgs, v, pkgBuildDirs, lastLayer, excluded)
|
||||
if errI == nil && lastLayer {
|
||||
// success after rollups
|
||||
return nil
|
||||
@@ -125,7 +126,7 @@ func (installer *Installer) Install(ctx context.Context,
|
||||
|
||||
// rollup
|
||||
installer.log.Warnln(gotext.Get("Failed to install layer, rolling up to next layer."), "error:", errI)
|
||||
targets[i-1] = mergeLayers(targets[i-1], targets[i])
|
||||
targets[i-1] = mergeLayers(targets[i-1], v)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -13,22 +13,18 @@ import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db/mock"
|
||||
"github.com/Jguer/yay/v12/pkg/dep"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v12/pkg/vcs"
|
||||
"github.com/Jguer/yay/v13/pkg/db/mock"
|
||||
"github.com/Jguer/yay/v13/pkg/dep"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/vcs"
|
||||
)
|
||||
|
||||
func newTestLogger() *text.Logger {
|
||||
return text.NewLogger(io.Discard, io.Discard, strings.NewReader(""), true, "test")
|
||||
}
|
||||
|
||||
func ptrString(s string) *string {
|
||||
return &s
|
||||
}
|
||||
|
||||
func TestInstaller_InstallNeeded(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
@@ -88,7 +84,6 @@ func TestInstaller_InstallNeeded(t *testing.T) {
|
||||
}
|
||||
|
||||
for _, tc := range testCases {
|
||||
tc := tc
|
||||
t.Run(tc.desc, func(td *testing.T) {
|
||||
td.Parallel()
|
||||
tmpDir := td.TempDir()
|
||||
@@ -151,8 +146,8 @@ func TestInstaller_InstallNeeded(t *testing.T) {
|
||||
Source: dep.AUR,
|
||||
Reason: dep.Explicit,
|
||||
Version: "91.0.0-1",
|
||||
SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"),
|
||||
AURBase: ptrString("yay"),
|
||||
SrcinfoPath: new(tmpDir + "/.SRCINFO"),
|
||||
AURBase: new("yay"),
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -244,8 +239,8 @@ func TestInstaller_BuildOnlySkipsInstall(t *testing.T) {
|
||||
Source: dep.AUR,
|
||||
Reason: dep.Explicit,
|
||||
Version: "91.0.0-1",
|
||||
SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"),
|
||||
AURBase: ptrString("yay"),
|
||||
SrcinfoPath: new(tmpDir + "/.SRCINFO"),
|
||||
AURBase: new("yay"),
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -321,14 +316,14 @@ func TestInstaller_InstallMixedSourcesAndLayers(t *testing.T) {
|
||||
Source: dep.AUR,
|
||||
Reason: dep.Explicit,
|
||||
Version: "91.0.0-1",
|
||||
SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"),
|
||||
AURBase: ptrString("yay"),
|
||||
SrcinfoPath: new(tmpDir + "/.SRCINFO"),
|
||||
AURBase: new("yay"),
|
||||
},
|
||||
"linux": {
|
||||
Source: dep.Sync,
|
||||
Reason: dep.Dep,
|
||||
Version: "17.0.0-1",
|
||||
SyncDBName: ptrString("core"),
|
||||
SyncDBName: new("core"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -350,15 +345,15 @@ func TestInstaller_InstallMixedSourcesAndLayers(t *testing.T) {
|
||||
Source: dep.AUR,
|
||||
Reason: dep.Explicit,
|
||||
Version: "91.0.0-1",
|
||||
SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"),
|
||||
AURBase: ptrString("yay"),
|
||||
SrcinfoPath: new(tmpDir + "/.SRCINFO"),
|
||||
AURBase: new("yay"),
|
||||
},
|
||||
}, {
|
||||
"linux": {
|
||||
Source: dep.Sync,
|
||||
Reason: dep.Dep,
|
||||
Version: "17.0.0-1",
|
||||
SyncDBName: ptrString("core"),
|
||||
SyncDBName: new("core"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -376,13 +371,13 @@ func TestInstaller_InstallMixedSourcesAndLayers(t *testing.T) {
|
||||
Source: dep.Sync,
|
||||
Reason: dep.Explicit,
|
||||
Version: "18.0.0-1",
|
||||
SyncDBName: ptrString("extra"),
|
||||
SyncDBName: new("extra"),
|
||||
},
|
||||
"linux": {
|
||||
Source: dep.Sync,
|
||||
Reason: dep.Explicit,
|
||||
Version: "17.0.0-1",
|
||||
SyncDBName: ptrString("core"),
|
||||
SyncDBName: new("core"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -404,15 +399,15 @@ func TestInstaller_InstallMixedSourcesAndLayers(t *testing.T) {
|
||||
Source: dep.AUR,
|
||||
Reason: dep.Explicit,
|
||||
Version: "91.0.0-1",
|
||||
SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"),
|
||||
AURBase: ptrString("yay"),
|
||||
SrcinfoPath: new(tmpDir + "/.SRCINFO"),
|
||||
AURBase: new("yay"),
|
||||
},
|
||||
"jellyfin-server": {
|
||||
Source: dep.AUR,
|
||||
Reason: dep.Explicit,
|
||||
Version: "10.8.8-1",
|
||||
SrcinfoPath: ptrString(tmpDirJfin + "/.SRCINFO"),
|
||||
AURBase: ptrString("jellyfin"),
|
||||
SrcinfoPath: new(tmpDirJfin + "/.SRCINFO"),
|
||||
AURBase: new("jellyfin"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -436,16 +431,16 @@ func TestInstaller_InstallMixedSourcesAndLayers(t *testing.T) {
|
||||
Source: dep.AUR,
|
||||
Reason: dep.Explicit,
|
||||
Version: "91.0.0-1",
|
||||
SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"),
|
||||
AURBase: ptrString("yay"),
|
||||
SrcinfoPath: new(tmpDir + "/.SRCINFO"),
|
||||
AURBase: new("yay"),
|
||||
},
|
||||
}, {
|
||||
"jellyfin-server": {
|
||||
Source: dep.AUR,
|
||||
Reason: dep.MakeDep,
|
||||
Version: "10.8.8-1",
|
||||
SrcinfoPath: ptrString(tmpDirJfin + "/.SRCINFO"),
|
||||
AURBase: ptrString("jellyfin"),
|
||||
SrcinfoPath: new(tmpDirJfin + "/.SRCINFO"),
|
||||
AURBase: new("jellyfin"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -453,7 +448,6 @@ func TestInstaller_InstallMixedSourcesAndLayers(t *testing.T) {
|
||||
}
|
||||
|
||||
for _, tc := range testCases {
|
||||
tc := tc
|
||||
t.Run(tc.desc, func(td *testing.T) {
|
||||
pkgTar := tmpDir + "/yay-91.0.0-1-x86_64.pkg.tar.zst"
|
||||
jfinPkgTar := tmpDirJfin + "/jellyfin-server-10.8.8-1-x86_64.pkg.tar.zst"
|
||||
@@ -610,8 +604,8 @@ func TestInstaller_CompileFailed(t *testing.T) {
|
||||
Source: dep.AUR,
|
||||
Reason: dep.Explicit,
|
||||
Version: "91.0.0-1",
|
||||
SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"),
|
||||
AURBase: ptrString("yay"),
|
||||
SrcinfoPath: new(tmpDir + "/.SRCINFO"),
|
||||
AURBase: new("yay"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -628,8 +622,8 @@ func TestInstaller_CompileFailed(t *testing.T) {
|
||||
Source: dep.AUR,
|
||||
Reason: dep.Explicit,
|
||||
Version: "91.0.0-1",
|
||||
SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"),
|
||||
AURBase: ptrString("yay"),
|
||||
SrcinfoPath: new(tmpDir + "/.SRCINFO"),
|
||||
AURBase: new("yay"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -642,15 +636,15 @@ func TestInstaller_CompileFailed(t *testing.T) {
|
||||
failPkgInstall: false,
|
||||
targets: []map[string]*dep.InstallInfo{
|
||||
{"bob": {
|
||||
AURBase: ptrString("yay"),
|
||||
AURBase: new("yay"),
|
||||
}},
|
||||
{
|
||||
"yay": {
|
||||
Source: dep.AUR,
|
||||
Reason: dep.Explicit,
|
||||
Version: "91.0.0-1",
|
||||
SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"),
|
||||
AURBase: ptrString("yay"),
|
||||
SrcinfoPath: new(tmpDir + "/.SRCINFO"),
|
||||
AURBase: new("yay"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -658,7 +652,6 @@ func TestInstaller_CompileFailed(t *testing.T) {
|
||||
}
|
||||
|
||||
for _, tc := range testCases {
|
||||
tc := tc
|
||||
t.Run(tc.desc, func(td *testing.T) {
|
||||
td.Parallel()
|
||||
pkgTar := tmpDir + "/yay-91.0.0-1-x86_64.pkg.tar.zst"
|
||||
@@ -759,23 +752,23 @@ func TestInstaller_InstallSplitPackage(t *testing.T) {
|
||||
Source: dep.AUR,
|
||||
Reason: dep.Explicit,
|
||||
Version: "10.8.4-1",
|
||||
SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"),
|
||||
AURBase: ptrString("jellyfin"),
|
||||
SrcinfoPath: new(tmpDir + "/.SRCINFO"),
|
||||
AURBase: new("jellyfin"),
|
||||
}},
|
||||
{
|
||||
"jellyfin-server": {
|
||||
Source: dep.AUR,
|
||||
Reason: dep.Dep,
|
||||
Version: "10.8.4-1",
|
||||
SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"),
|
||||
AURBase: ptrString("jellyfin"),
|
||||
SrcinfoPath: new(tmpDir + "/.SRCINFO"),
|
||||
AURBase: new("jellyfin"),
|
||||
},
|
||||
"jellyfin-web": {
|
||||
Source: dep.AUR,
|
||||
Reason: dep.Dep,
|
||||
Version: "10.8.4-1",
|
||||
SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"),
|
||||
AURBase: ptrString("jellyfin"),
|
||||
SrcinfoPath: new(tmpDir + "/.SRCINFO"),
|
||||
AURBase: new("jellyfin"),
|
||||
},
|
||||
},
|
||||
{
|
||||
@@ -783,19 +776,19 @@ func TestInstaller_InstallSplitPackage(t *testing.T) {
|
||||
Source: dep.Sync,
|
||||
Reason: dep.Dep,
|
||||
Version: "6.0.12.sdk112-1",
|
||||
SyncDBName: ptrString("community"),
|
||||
SyncDBName: new("community"),
|
||||
},
|
||||
"aspnet-runtime": {
|
||||
Source: dep.Sync,
|
||||
Reason: dep.Dep,
|
||||
Version: "6.0.12.sdk112-1",
|
||||
SyncDBName: ptrString("community"),
|
||||
SyncDBName: new("community"),
|
||||
},
|
||||
"dotnet-sdk-6.0": {
|
||||
Source: dep.Sync,
|
||||
Reason: dep.MakeDep,
|
||||
Version: "6.0.12.sdk112-1",
|
||||
SyncDBName: ptrString("community"),
|
||||
SyncDBName: new("community"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -816,7 +809,6 @@ func TestInstaller_InstallSplitPackage(t *testing.T) {
|
||||
}
|
||||
|
||||
for _, tc := range testCases {
|
||||
tc := tc
|
||||
t.Run(tc.desc, func(td *testing.T) {
|
||||
td.Parallel()
|
||||
pkgTars := []string{
|
||||
@@ -953,7 +945,6 @@ func TestInstaller_InstallDownloadOnly(t *testing.T) {
|
||||
}
|
||||
|
||||
for _, tc := range testCases {
|
||||
tc := tc
|
||||
t.Run(tc.desc, func(td *testing.T) {
|
||||
td.Parallel()
|
||||
tmpDir := td.TempDir()
|
||||
@@ -1015,8 +1006,8 @@ func TestInstaller_InstallDownloadOnly(t *testing.T) {
|
||||
Source: dep.AUR,
|
||||
Reason: dep.Explicit,
|
||||
Version: "91.0.0-1",
|
||||
SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"),
|
||||
AURBase: ptrString("yay"),
|
||||
SrcinfoPath: new(tmpDir + "/.SRCINFO"),
|
||||
AURBase: new("yay"),
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -1079,7 +1070,6 @@ func TestInstaller_InstallGroup(t *testing.T) {
|
||||
}
|
||||
|
||||
for _, tc := range testCases {
|
||||
tc := tc
|
||||
t.Run(tc.desc, func(td *testing.T) {
|
||||
td.Parallel()
|
||||
tmpDir := td.TempDir()
|
||||
@@ -1119,7 +1109,7 @@ func TestInstaller_InstallGroup(t *testing.T) {
|
||||
Reason: dep.Explicit,
|
||||
Version: "",
|
||||
IsGroup: true,
|
||||
SyncDBName: ptrString("community"),
|
||||
SyncDBName: new("community"),
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -1196,8 +1186,8 @@ func TestInstaller_InstallRebuild(t *testing.T) {
|
||||
Source: dep.AUR,
|
||||
Reason: dep.Explicit,
|
||||
Version: "91.0.0-1",
|
||||
SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"),
|
||||
AURBase: ptrString("yay"),
|
||||
SrcinfoPath: new(tmpDir + "/.SRCINFO"),
|
||||
AURBase: new("yay"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -1220,8 +1210,8 @@ func TestInstaller_InstallRebuild(t *testing.T) {
|
||||
Source: dep.AUR,
|
||||
Reason: dep.Explicit,
|
||||
Version: "91.0.0-1",
|
||||
SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"),
|
||||
AURBase: ptrString("yay"),
|
||||
SrcinfoPath: new(tmpDir + "/.SRCINFO"),
|
||||
AURBase: new("yay"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -1244,8 +1234,8 @@ func TestInstaller_InstallRebuild(t *testing.T) {
|
||||
Source: dep.AUR,
|
||||
Reason: dep.Explicit,
|
||||
Version: "91.0.0-1",
|
||||
SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"),
|
||||
AURBase: ptrString("yay"),
|
||||
SrcinfoPath: new(tmpDir + "/.SRCINFO"),
|
||||
AURBase: new("yay"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -1268,8 +1258,8 @@ func TestInstaller_InstallRebuild(t *testing.T) {
|
||||
Source: dep.AUR,
|
||||
Reason: dep.Dep,
|
||||
Version: "91.0.0-1",
|
||||
SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"),
|
||||
AURBase: ptrString("yay"),
|
||||
SrcinfoPath: new(tmpDir + "/.SRCINFO"),
|
||||
AURBase: new("yay"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -1277,7 +1267,6 @@ func TestInstaller_InstallRebuild(t *testing.T) {
|
||||
}
|
||||
|
||||
for _, tc := range testCases {
|
||||
tc := tc
|
||||
t.Run(tc.desc, func(td *testing.T) {
|
||||
td.Parallel()
|
||||
tmpDir := td.TempDir()
|
||||
@@ -1396,7 +1385,6 @@ func TestInstaller_InstallUpgrade(t *testing.T) {
|
||||
}
|
||||
|
||||
for _, tc := range testCases {
|
||||
tc := tc
|
||||
t.Run(tc.desc, func(td *testing.T) {
|
||||
td.Parallel()
|
||||
mockDB := &mock.DBExecutor{}
|
||||
@@ -1421,7 +1409,7 @@ func TestInstaller_InstallUpgrade(t *testing.T) {
|
||||
Source: dep.Sync,
|
||||
Reason: dep.Dep,
|
||||
Version: "17.0.0-1",
|
||||
SyncDBName: ptrString("core"),
|
||||
SyncDBName: new("core"),
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -1485,8 +1473,8 @@ func TestInstaller_KeepSrc(t *testing.T) {
|
||||
Source: dep.AUR,
|
||||
Reason: dep.Explicit,
|
||||
Version: "92.0.0-1",
|
||||
SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"),
|
||||
AURBase: ptrString("yay"),
|
||||
SrcinfoPath: new(tmpDir + "/.SRCINFO"),
|
||||
AURBase: new("yay"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -1494,7 +1482,6 @@ func TestInstaller_KeepSrc(t *testing.T) {
|
||||
}
|
||||
|
||||
for _, tc := range testCases {
|
||||
tc := tc
|
||||
t.Run(tc.desc, func(td *testing.T) {
|
||||
td.Parallel()
|
||||
tmpDir := td.TempDir()
|
||||
@@ -1596,8 +1583,8 @@ func TestInstaller_InstallAsExplicit(t *testing.T) {
|
||||
Source: dep.AUR,
|
||||
Reason: dep.Dep,
|
||||
Version: "91.0.0-1",
|
||||
SrcinfoPath: ptrString(tmpDir + "/.SRCINFO"),
|
||||
AURBase: ptrString("yay"),
|
||||
SrcinfoPath: new(tmpDir + "/.SRCINFO"),
|
||||
AURBase: new("yay"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -1623,7 +1610,7 @@ func TestInstaller_InstallAsExplicit(t *testing.T) {
|
||||
Source: dep.Sync,
|
||||
Reason: dep.Dep,
|
||||
Version: "17.0.0-1",
|
||||
SyncDBName: ptrString("core"),
|
||||
SyncDBName: new("core"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -1636,7 +1623,6 @@ func TestInstaller_InstallAsExplicit(t *testing.T) {
|
||||
}
|
||||
|
||||
for _, tc := range testCases {
|
||||
tc := tc
|
||||
t.Run(tc.desc, func(td *testing.T) {
|
||||
td.Parallel()
|
||||
pkgTar := tmpDir + "/yay-91.0.0-1-x86_64.pkg.tar.zst"
|
||||
|
||||
@@ -10,10 +10,10 @@ import (
|
||||
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/vcs"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/vcs"
|
||||
)
|
||||
|
||||
func installPkgArchive(ctx context.Context,
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
)
|
||||
|
||||
func TestParsePackageList(t *testing.T) {
|
||||
|
||||
@@ -4,8 +4,8 @@ import (
|
||||
"maps"
|
||||
"slices"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/dep"
|
||||
settingslua "github.com/Jguer/yay/v12/pkg/settings/lua"
|
||||
"github.com/Jguer/yay/v13/pkg/dep"
|
||||
settingslua "github.com/Jguer/yay/v13/pkg/settings/lua"
|
||||
)
|
||||
|
||||
// postInstallEvent flattens the resolved topo layers into the PostInstall
|
||||
@@ -14,9 +14,7 @@ import (
|
||||
func postInstallEvent(targets []map[string]*dep.InstallInfo, failedAndIgnored map[string]error) *settingslua.PostInstallEvent {
|
||||
merged := map[string]*dep.InstallInfo{}
|
||||
for _, layer := range targets {
|
||||
for name, info := range layer {
|
||||
merged[name] = info
|
||||
}
|
||||
maps.Copy(merged, layer)
|
||||
}
|
||||
|
||||
names := slices.Sorted(maps.Keys(merged))
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package sync
|
||||
|
||||
@@ -8,8 +7,8 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/dep"
|
||||
settingslua "github.com/Jguer/yay/v12/pkg/settings/lua"
|
||||
"github.com/Jguer/yay/v13/pkg/dep"
|
||||
settingslua "github.com/Jguer/yay/v13/pkg/settings/lua"
|
||||
)
|
||||
|
||||
func TestPostInstallEvent(t *testing.T) {
|
||||
|
||||
@@ -10,8 +10,8 @@ import (
|
||||
gosrc "github.com/Morganamilo/go-srcinfo"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
// pgpKeySet maps a PGP key with a list of PKGBUILDs that require it.
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package pgp
|
||||
|
||||
@@ -17,8 +16,8 @@ import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func newTestLogger() *text.Logger {
|
||||
|
||||
@@ -9,13 +9,13 @@ import (
|
||||
gosrc "github.com/Morganamilo/go-srcinfo"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
"github.com/Jguer/yay/v12/pkg/dep"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/sync/srcinfo/pgp"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v12/pkg/vcs"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
"github.com/Jguer/yay/v13/pkg/dep"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/sync/srcinfo/pgp"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/vcs"
|
||||
)
|
||||
|
||||
type Service struct {
|
||||
|
||||
@@ -10,12 +10,12 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db/mock"
|
||||
"github.com/Jguer/yay/v12/pkg/dep"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v12/pkg/vcs"
|
||||
"github.com/Jguer/yay/v13/pkg/db/mock"
|
||||
"github.com/Jguer/yay/v13/pkg/dep"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/vcs"
|
||||
)
|
||||
|
||||
func newTestLogger() *text.Logger {
|
||||
|
||||
+11
-11
@@ -5,17 +5,17 @@ import (
|
||||
"errors"
|
||||
"sync"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/completion"
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
"github.com/Jguer/yay/v12/pkg/dep"
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
settingslua "github.com/Jguer/yay/v12/pkg/settings/lua"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/sync/build"
|
||||
"github.com/Jguer/yay/v12/pkg/sync/srcinfo"
|
||||
"github.com/Jguer/yay/v12/pkg/sync/workdir"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/completion"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
"github.com/Jguer/yay/v13/pkg/dep"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
settingslua "github.com/Jguer/yay/v13/pkg/settings/lua"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/sync/build"
|
||||
"github.com/Jguer/yay/v13/pkg/sync/srcinfo"
|
||||
"github.com/Jguer/yay/v13/pkg/sync/workdir"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
|
||||
"github.com/leonelquinteros/gotext"
|
||||
)
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package workdir
|
||||
|
||||
import (
|
||||
"github.com/Jguer/yay/v12/pkg/dep"
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
settingslua "github.com/Jguer/yay/v12/pkg/settings/lua"
|
||||
"github.com/Jguer/yay/v13/pkg/dep"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
settingslua "github.com/Jguer/yay/v13/pkg/settings/lua"
|
||||
|
||||
mapset "github.com/deckarep/golang-set/v2"
|
||||
)
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package workdir
|
||||
|
||||
@@ -12,9 +11,9 @@ import (
|
||||
"github.com/stretchr/testify/require"
|
||||
glua "github.com/yuin/gopher-lua"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/dep"
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
settingslua "github.com/Jguer/yay/v12/pkg/settings/lua"
|
||||
"github.com/Jguer/yay/v13/pkg/dep"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
settingslua "github.com/Jguer/yay/v13/pkg/settings/lua"
|
||||
)
|
||||
|
||||
func TestAURPostDownloadEventsUseAURPreInstallPayload(t *testing.T) {
|
||||
@@ -73,8 +72,8 @@ func TestRunAURPostDownloadLuaHooksRunsBasesInSortedOrder(t *testing.T) {
|
||||
mapset.NewThreadUnsafeSet[string](),
|
||||
[]map[string]*dep.InstallInfo{
|
||||
{
|
||||
"a": {Source: dep.AUR, AURBase: ptrString("a-base")},
|
||||
"z": {Source: dep.AUR, AURBase: ptrString("z-base")},
|
||||
"a": {Source: dep.AUR, AURBase: new("a-base")},
|
||||
"z": {Source: dep.AUR, AURBase: new("z-base")},
|
||||
},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
@@ -10,9 +10,9 @@ import (
|
||||
"path/filepath"
|
||||
"slices"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/dep"
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
settingslua "github.com/Jguer/yay/v12/pkg/settings/lua"
|
||||
"github.com/Jguer/yay/v13/pkg/dep"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
settingslua "github.com/Jguer/yay/v13/pkg/settings/lua"
|
||||
|
||||
gosrc "github.com/Morganamilo/go-srcinfo"
|
||||
mapset "github.com/deckarep/golang-set/v2"
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package workdir
|
||||
|
||||
@@ -14,10 +13,10 @@ import (
|
||||
"github.com/stretchr/testify/require"
|
||||
glua "github.com/yuin/gopher-lua"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/dep"
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
settingslua "github.com/Jguer/yay/v12/pkg/settings/lua"
|
||||
"github.com/Jguer/yay/v13/pkg/dep"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
settingslua "github.com/Jguer/yay/v13/pkg/settings/lua"
|
||||
)
|
||||
|
||||
func TestAURPreInstallEventsFromPackageFiles(t *testing.T) {
|
||||
@@ -115,8 +114,8 @@ func TestRunAURPreInstallLuaHooksRunsBasesInSortedOrder(t *testing.T) {
|
||||
mapset.NewThreadUnsafeSet[string](),
|
||||
[]map[string]*dep.InstallInfo{
|
||||
{
|
||||
"a": {Source: dep.AUR, AURBase: ptrString("a-base")},
|
||||
"z": {Source: dep.AUR, AURBase: ptrString("z-base")},
|
||||
"a": {Source: dep.AUR, AURBase: new("a-base")},
|
||||
"z": {Source: dep.AUR, AURBase: new("z-base")},
|
||||
},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
@@ -234,7 +233,3 @@ pkgname = demo-doc
|
||||
|
||||
return dir
|
||||
}
|
||||
|
||||
func ptrString(s string) *string {
|
||||
return &s
|
||||
}
|
||||
@@ -10,8 +10,8 @@ import (
|
||||
mapset "github.com/deckarep/golang-set/v2"
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
type ErrDownloadSource struct {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package workdir
|
||||
|
||||
@@ -13,7 +12,7 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
)
|
||||
|
||||
type TestMakepkgBuilder struct {
|
||||
|
||||
@@ -5,11 +5,11 @@ import (
|
||||
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func removeMake(ctx context.Context, config *settings.Configuration,
|
||||
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
|
||||
"github.com/leonelquinteros/gotext"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
)
|
||||
|
||||
func gitMerge(ctx context.Context, cmdBuilder exe.ICmdBuilder, dir string) error {
|
||||
|
||||
@@ -8,16 +8,16 @@ import (
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/db"
|
||||
"github.com/Jguer/yay/v12/pkg/dep"
|
||||
"github.com/Jguer/yay/v12/pkg/download"
|
||||
"github.com/Jguer/yay/v12/pkg/menus"
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/sync/build"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/db"
|
||||
"github.com/Jguer/yay/v13/pkg/dep"
|
||||
"github.com/Jguer/yay/v13/pkg/download"
|
||||
"github.com/Jguer/yay/v13/pkg/menus"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/exe"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/sync/build"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
|
||||
gosrc "github.com/Morganamilo/go-srcinfo"
|
||||
mapset "github.com/deckarep/golang-set/v2"
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package workdir
|
||||
|
||||
@@ -10,8 +9,8 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func newTestLogger() *text.Logger {
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//go:build !integration
|
||||
// +build !integration
|
||||
|
||||
package workdir
|
||||
|
||||
@@ -11,10 +10,10 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/Jguer/yay/v12/pkg/runtime"
|
||||
"github.com/Jguer/yay/v12/pkg/settings"
|
||||
"github.com/Jguer/yay/v12/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v12/pkg/text"
|
||||
"github.com/Jguer/yay/v13/pkg/runtime"
|
||||
"github.com/Jguer/yay/v13/pkg/settings"
|
||||
"github.com/Jguer/yay/v13/pkg/settings/parser"
|
||||
"github.com/Jguer/yay/v13/pkg/text"
|
||||
)
|
||||
|
||||
func TestMergePkgbuilds(t *testing.T) {
|
||||
|
||||
Loaded 100 of 124 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user