forked from toolshed/abra
Compare commits
3 Commits
main
...
cr_fix_ls-
Author | SHA1 | Date | |
---|---|---|---|
d041deec68 | |||
3939971d82 | |||
1d098eed0e |
5
Makefile
5
Makefile
@ -30,6 +30,11 @@ build-kadabra:
|
|||||||
|
|
||||||
build: build-abra build-kadabra
|
build: build-abra build-kadabra
|
||||||
|
|
||||||
|
build-docker-abra:
|
||||||
|
docker run -it -v $(PWD):/abra golang:1.21 bash -c 'cd /abra; ./build-docker-inside.sh'
|
||||||
|
|
||||||
|
build-docker: build-docker-abra
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
@rm '$(GOPATH)/bin/abra'
|
@rm '$(GOPATH)/bin/abra'
|
||||||
@rm '$(GOPATH)/bin/kadabra'
|
@rm '$(GOPATH)/bin/kadabra'
|
||||||
|
19
build-docker-inside.sh
Executable file
19
build-docker-inside.sh
Executable file
@ -0,0 +1,19 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
if [ ! -f .envrc ]; then
|
||||||
|
. .envrc.sample
|
||||||
|
else
|
||||||
|
. .envrc
|
||||||
|
fi
|
||||||
|
git config --global --add safe.directory /abra # work around funky file permissions
|
||||||
|
|
||||||
|
# fixme for some reason we need to do this
|
||||||
|
go get coopcloud.tech/abra/pkg/upstream/commandconn
|
||||||
|
go get github.com/sirupsen/logrus@v1.9.3
|
||||||
|
go get github.com/cloudflare/circl/dh/x25519@v1.3.3
|
||||||
|
go get github.com/mattn/go-runewidth@v0.0.14
|
||||||
|
go get go get coopcloud.tech/abra/pkg/config
|
||||||
|
go get github.com/mattn/go-colorable@v0.1.12
|
||||||
|
go get coopcloud.tech/abra/pkg/config
|
||||||
|
#
|
||||||
|
|
||||||
|
make build
|
@ -176,13 +176,14 @@ can take some time.
|
|||||||
appStats.AutoUpdate = autoUpdate
|
appStats.AutoUpdate = autoUpdate
|
||||||
|
|
||||||
var newUpdates []string
|
var newUpdates []string
|
||||||
if version != "unknown" {
|
|
||||||
updates, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
|
|
||||||
if err != nil {
|
|
||||||
logrus.Fatal(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
if (version != "unknown") {
|
||||||
parsedVersion, err := tagcmp.Parse(version)
|
parsedVersion, err := tagcmp.Parse(version)
|
||||||
|
if (err != nil) {
|
||||||
|
logrus.Warning("Can't parse ", app.Recipe, " version ", version, " ", err)
|
||||||
|
} else {
|
||||||
|
updates, err := recipe.GetRecipeCatalogueVersions(app.Recipe, catl)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
@ -190,7 +191,8 @@ can take some time.
|
|||||||
for _, update := range updates {
|
for _, update := range updates {
|
||||||
parsedUpdate, err := tagcmp.Parse(update)
|
parsedUpdate, err := tagcmp.Parse(update)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Warning("can't parse ", app.Recipe," update version ", update, " ", err)
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if update != version && parsedUpdate.IsGreaterThan(parsedVersion) {
|
if update != version && parsedUpdate.IsGreaterThan(parsedVersion) {
|
||||||
@ -198,6 +200,7 @@ can take some time.
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if len(newUpdates) == 0 {
|
if len(newUpdates) == 0 {
|
||||||
if version == "unknown" {
|
if version == "unknown" {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user