Added github download redirect handler for raw.githubusercontent.com

This commit is contained in:
frikky
2021-12-31 16:54:12 +01:00
parent e386709118
commit 5342a19e38
8 changed files with 27 additions and 85 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
NAME=shuffle-orborus
VERSION=0.9.42
VERSION=0.9.44
echo "Running docker build with $NAME:$VERSION"
#docker rmi frikky/shuffle:$NAME --force
+1 -1
View File
@@ -1,5 +1,5 @@
NAME=shuffle-worker
VERSION=0.9.43
VERSION=0.9.44
echo "Running docker build with $NAME:$VERSION"
#CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o worker.bin .
+16 -2
View File
@@ -85,7 +85,6 @@ var autoDeploy = map[string]string{
"testing:1.0.0": "frikky/shuffle:testing_1.0.0",
}
//if !shuffle.ArrayContains(executedIds,
//fmt.Sprintf("%s_%s", workflowExecution.ExecutionId, action.ID)
// New Worker mappings
@@ -855,6 +854,20 @@ func handleExecutionResult(workflowExecution shuffle.WorkflowExecution) {
continue
}
newExecId := fmt.Sprintf("%s_%s", workflowExecution.ExecutionId, nextAction)
if !shuffle.ArrayContains(executedIds, newExecId) {
executedIds = append(executedIds, newExecId)
toRemove = append(toRemove, index)
} else {
log.Printf("\n\n[DEBUG] %s is already executed. Continuing.", newExecId)
continue
}
// max 1000 :o
if len(executedIds) >= 1000 {
executedIds = executedIds[900:999]
}
if action.AppName == "Shuffle Tools" && (action.Name == "skip_me" || action.Name == "router" || action.Name == "route") {
err := runSkipAction(topClient, action, workflowExecution.Workflow.ID, workflowExecution.ExecutionId, workflowExecution.Authorization, "SKIPPED")
if err != nil {
@@ -2888,7 +2901,8 @@ func main() {
}
*/
_, err := shuffle.RunInit(datastore.Client{}, storage.Client{}, "", "", true, "")
// Elasticsearch necessary to ensure we'ren ot running with Datastore configurations for minimal/maximal data sizes
_, err := shuffle.RunInit(datastore.Client{}, storage.Client{}, "", "", true, "elasticsearch")
if err != nil {
log.Printf("[ERROR] Failed to run worker init: %s", err)
} else {