mirror of
https://github.com/kevin-DL/revel-cmd.git
synced 2026-01-11 18:54:31 +00:00
Merge pull request #215 from revel/hotfix/v1.1.1_2
Removed duplicate package requests
This commit is contained in:
2
.vscode/tasks.json
vendored
2
.vscode/tasks.json
vendored
@@ -6,7 +6,7 @@
|
|||||||
{
|
{
|
||||||
"label": "Clean-Test-Project",
|
"label": "Clean-Test-Project",
|
||||||
"type": "shell",
|
"type": "shell",
|
||||||
"command": "rm -rf ${workspaceRoot}/.temp/revel/testproject"
|
"command": "rm -rf ${workspaceRoot}/.temp/revel/reveltest"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"label": "Update Go Mod",
|
"label": "Update Go Mod",
|
||||||
|
|||||||
@@ -224,10 +224,25 @@ func Build(c *model.CommandConfig, paths *model.RevelContainer) (_ *App, err err
|
|||||||
utils.Logger.Info("Build failed no missing imports", "message", stOutput)
|
utils.Logger.Info("Build failed no missing imports", "message", stOutput)
|
||||||
return nil, newCompileError(paths, output)
|
return nil, newCompileError(paths, output)
|
||||||
}
|
}
|
||||||
utils.Logger.Warn("Detected missing packages, importing them", "packages", len(matches))
|
// Reduce the matches down to unique ones
|
||||||
|
missedPkgs := []string{}
|
||||||
for _, match := range matches {
|
for _, match := range matches {
|
||||||
|
found := false
|
||||||
|
for _, pkgName := range missedPkgs {
|
||||||
|
if match[1] == pkgName {
|
||||||
|
found = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !found {
|
||||||
|
missedPkgs = append(missedPkgs, match[1])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
utils.Logger.Warn("Detected missing packages, importing them", "packages", len(matches))
|
||||||
|
for _, pkgName := range missedPkgs {
|
||||||
// Ensure we haven't already tried to go get it.
|
// Ensure we haven't already tried to go get it.
|
||||||
pkgName := match[1]
|
|
||||||
utils.Logger.Info("Trying to import ", "package", pkgName)
|
utils.Logger.Info("Trying to import ", "package", pkgName)
|
||||||
if _, alreadyTried := gotten[pkgName]; alreadyTried {
|
if _, alreadyTried := gotten[pkgName]; alreadyTried {
|
||||||
utils.Logger.Error("Failed to import ", "package", pkgName)
|
utils.Logger.Error("Failed to import ", "package", pkgName)
|
||||||
@@ -235,7 +250,7 @@ func Build(c *model.CommandConfig, paths *model.RevelContainer) (_ *App, err err
|
|||||||
}
|
}
|
||||||
gotten[pkgName] = struct{}{}
|
gotten[pkgName] = struct{}{}
|
||||||
if err := c.PackageResolver(pkgName); err != nil {
|
if err := c.PackageResolver(pkgName); err != nil {
|
||||||
panic("failed to resolve")
|
// panic("failed to resolve")
|
||||||
utils.Logger.Error("Unable to resolve package", "package", pkgName, "error", err)
|
utils.Logger.Error("Unable to resolve package", "package", pkgName, "error", err)
|
||||||
return nil, newCompileError(paths, []byte(err.Error()))
|
return nil, newCompileError(paths, []byte(err.Error()))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,10 +6,10 @@ package cmd
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
// Version current Revel version
|
// Version current Revel version
|
||||||
Version = "1.1.0"
|
Version = "1.1.2"
|
||||||
|
|
||||||
// BuildDate latest commit/release date
|
// BuildDate latest commit/release date
|
||||||
BuildDate = "2022-04-11"
|
BuildDate = "2022-04-12"
|
||||||
|
|
||||||
// MinimumGoVersion minimum required Go version for Revel
|
// MinimumGoVersion minimum required Go version for Revel
|
||||||
MinimumGoVersion = ">= go1.17"
|
MinimumGoVersion = ">= go1.17"
|
||||||
|
|||||||
Reference in New Issue
Block a user