works okay again after 'go get' deprecation

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2024-11-04 05:44:32 -06:00
parent 5b80e9bd2e
commit 04e5b38887
3 changed files with 35 additions and 3 deletions

View File

@ -49,10 +49,10 @@ redomod:
curl-help: curl-help:
curl --silent http://localhost:9419/help curl --silent http://localhost:9419/help
curl-list: curl-list-changed:
curl --silent http://localhost:9419/list?perfect=false curl --silent http://localhost:9419/list?perfect=false
curl-list-readonly: curl-list-include-readonly:
curl --silent http://localhost:9419/list?readonly=true curl --silent http://localhost:9419/list?readonly=true
curl-gitpull-everypackage: curl-gitpull-everypackage:
@ -64,6 +64,12 @@ curl-gitpull-helloworld:
curl-gitpull-basicworld: curl-gitpull-basicworld:
curl --silent http://localhost:9419/gitpull?repo=go.wit.com/apps/basicworld curl --silent http://localhost:9419/gitpull?repo=go.wit.com/apps/basicworld
curl-release-helloworld:
curl --silent http://localhost:9419/release?repo=go.wit.com/apps/helloworld
curl-release-gowit:
curl --silent http://localhost:9419/release?repo=go.wit.com/lib/gui/gowit
curl-file-for-go.wit.com: curl-file-for-go.wit.com:
curl --silent http://localhost:9419/goweblist?readonly=true curl --silent http://localhost:9419/goweblist?readonly=true
curl --silent http://localhost:9419/goweblist?readonly=true |sort > ~/go.wit.com.versions curl --silent http://localhost:9419/goweblist?readonly=true |sort > ~/go.wit.com.versions

View File

@ -52,6 +52,11 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
return return
} }
if route == "/release" {
simpleRelease(w, r)
return
}
if route == "/gitpull" { if route == "/gitpull" {
repoName := r.URL.Query().Get("repo") repoName := r.URL.Query().Get("repo")
if repoName != "" { if repoName != "" {

View File

@ -1,6 +1,7 @@
package main package main
import ( import (
"fmt"
"net/http" "net/http"
"strings" "strings"
) )
@ -17,19 +18,39 @@ import (
func simpleRelease(w http.ResponseWriter, r *http.Request) { func simpleRelease(w http.ResponseWriter, r *http.Request) {
repoName := r.URL.Query().Get("repo") repoName := r.URL.Query().Get("repo")
if repoName == "" { if repoName == "" {
msg(w, "url did not have repo variable")
return return
} }
// git pull (or go-clone of it doesn't exist) // git pull (or go-clone of it doesn't exist)
repo := me.repos.View.FindRepoByName(repoName) repo := me.repos.View.FindRepoByName(repoName)
if repo == nil { if repo == nil {
msg(w, "repo unknown: " + repoName)
return return
} }
header := repo.StandardHeader() header := repo.StandardHeader()
if repo.CheckDirty() { if repo.CheckDirty() {
msg(w, header+"skip dirty repo") msg(w, header+"skip dirty repo")
continue return
}
if repo.State() == "PERFECT" {
msg(w, header+"already released")
return
}
curName := repo.Status.GetCurrentBranchName()
mName := repo.Status.GetMasterBranchName()
if curName != mName {
// s := log.Sprintf("\trepo is not working from main branch", curName, "!=", mName)
s := fmt.Sprint("repo is not working from main branch ", curName, " != ", mName)
msg(w, s)
return
} }
cmd := []string{"git", "pull", "-v"} cmd := []string{"git", "pull", "-v"}
msg(w, header+strings.Join(cmd, " ")) msg(w, header+strings.Join(cmd, " "))
if repo.Status.MergeUserToDevel() {
msg(w, "THINGS SEEM OK MergeUserToDevel() returned true.")
} else {
msg(w, "THINGS FAILED MergeUserToDevel() returned false")
}
return return
} }