Skip to content

Commit

Permalink
Merge branch 'enh/runner' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
SebiWrn committed Oct 24, 2024
2 parents 4e1ee81 + 5770259 commit 440986b
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-runners.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:
push:
tags:
- '.*beta.*'
- '*beta*'

permissions:
packages: write
Expand Down
2 changes: 2 additions & 0 deletions api/runner_grpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ type GrpcRunnerServer struct {
dao.DaoWrapper
}

//

func (g GrpcRunnerServer) Register(ctx context.Context, request *protobuf.RegisterRequest) (*protobuf.RegisterResponse, error) {
runner := model.Runner{
Hostname: request.Hostname,
Expand Down
3 changes: 2 additions & 1 deletion api/stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"errors"
"fmt"
"github.com/getsentry/sentry-go"
"net/http"
"os"
"path/filepath"
Expand All @@ -18,7 +19,6 @@ import (
"github.com/TUM-Dev/gocast/tools"
"github.com/TUM-Dev/gocast/tools/bot"
"github.com/TUM-Dev/gocast/voice-service/pb"
"github.com/getsentry/sentry-go"
"github.com/gin-gonic/gin"
uuid "github.com/satori/go.uuid"
"gorm.io/gorm"
Expand Down Expand Up @@ -893,4 +893,5 @@ func (r streamRoutes) updateChatEnabled(c *gin.Context) {
c.AbortWithStatusJSON(http.StatusBadRequest, "could not update stream")
return
}

}
2 changes: 1 addition & 1 deletion tools/stream-signing.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func SetSignedPlaylists(s *model.Stream, user *model.User, allowDownloading bool
}

for _, playlist := range playlists {
if strings.Contains(playlist.Playlist, "localhost") || strings.Contains(playlist.Playlist, "lrz.de") { // todo: remove after migration from lrz services
if strings.Contains(playlist.Playlist, "lrz.de") { // todo: remove after migration from lrz services
continue
}

Expand Down
1 change: 1 addition & 0 deletions web/ts/entry/home.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ export * from "../components/main";
export * from "../search";
export * from "../utilities/date";
export * from "../utilities/lectureHallValidator";
export * from "../utilities/lectureHallValidator";

0 comments on commit 440986b

Please sign in to comment.