diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 040804f..09f6817 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,9 +5,19 @@ build: script: - cd fedilogue - go get . - - go build ./fedilogue + - go build + - cd ../fedictl + - go build + - cd ../restapi + - go build only: - main + artifacts: + name: "$CI_JOB_NAME" + paths: + - fedilogue/fedilogue + - fedictl/fedictl + - restapi/restapi test: stage: test @@ -15,5 +25,11 @@ test: - cd fedilogue - go get . - go test -v + - cd ../fedictl + - go get . + - go test -v + - cd ../restapi + - go get . + - go test -v only: - merge_requests diff --git a/restapi/restapi.go b/restapi/restapi.go index 9ef1860..a3edf42 100644 --- a/restapi/restapi.go +++ b/restapi/restapi.go @@ -52,7 +52,7 @@ func gettrends() { data, err := json.Marshal(totalJson) if err != nil { - log.Fatal("error marshaling combined activity: %v", err) + log.Fatalf("error marshaling combined activity: %v\n", err) } trendingexport = string(data) @@ -140,7 +140,7 @@ func search(w http.ResponseWriter, r *http.Request) { data, err := json.Marshal(totalJson) if err != nil { - log.Fatal("error marshaling combined activity: %v", err) + log.Fatalf("error marshaling combined activity: %v\n", err) } fmt.Fprintf(w, "%s", data) }