Merge branch 'ai-video' into pr/3200

JJassonn69 · Oct 26, 2024 · b0fb366 · b0fb366
2 parents b6dea6e + 4d966f8
commit b0fb366
Show file tree

Hide file tree

Showing 50 changed files with 7,049 additions and 2,622 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -4,7 +4,6 @@ on:
   pull_request:
   push:
     branches:
-      # - master
       - ai-video
     tags:
       - "v*"
@@ -70,7 +69,7 @@ jobs:
         id: go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21.5
+          go-version: 1.23.2
           cache: true
           cache-dependency-path: go.sum
 
@@ -172,7 +171,7 @@ jobs:
         id: go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21.5
+          go-version: 1.23.2
           cache: true
           cache-dependency-path: go.sum
 
@@ -338,7 +337,7 @@ jobs:
           destination: "build.livepeer.live/${{ github.event.repository.name }}/ai-video/stable"
           parent: false
           process_gcloudignore: false
-      
+
       # Update the latest branch manifest
       - name: Upload branch manifest file to Google Cloud stable folder
         id: upload-manifest-latest

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -1,9 +1,10 @@
 name: Trigger test suite
 
 on:
-  # pull_request:
-  #   branches:
-  #     - master
+  pull_request:
+    branches:
+      - master
+      - ai-video
   push:
     branches:
       - master
@@ -43,7 +44,7 @@ jobs:
         id: go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21.5
+          go-version: 1.23.2
           cache: true
           cache-dependency-path: go.sum
 
@@ -94,9 +95,9 @@ jobs:
       - name: Lint
         uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.52.2
+          version: v1.61.0
           skip-pkg-cache: true
-          args: '--disable-all --enable=gofmt --enable=vet --enable=golint --deadline=4m pm verification'
+          args: '--out-format=colored-line-number --disable-all --enable=gofmt --enable=govet --enable=revive --timeout=4m pm verification'
 
       - name: Run Revive Action by building from repository
         uses: docker://morphy/revive-action:v2

diff --git a/cmd/livepeer/livepeer.go b/cmd/livepeer/livepeer.go
@@ -156,6 +156,7 @@ func parseLivepeerConfig() starter.LivepeerConfig {
 	cfg.HevcDecoding = flag.Bool("hevcDecoding", *cfg.HevcDecoding, "Enable or disable HEVC decoding")
 
 	// AI:
+	cfg.AIServiceRegistry = flag.Bool("aiServiceRegistry", *cfg.AIServiceRegistry, "Set to true to use an AI ServiceRegistry contract address")
 	cfg.AIWorker = flag.Bool("aiWorker", *cfg.AIWorker, "Set to true to run an AI worker")
 	cfg.AIModels = flag.String("aiModels", *cfg.AIModels, "Set models (pipeline:model_id) for AI worker to load upon initialization")
 	cfg.AIModelsDir = flag.String("aiModelsDir", *cfg.AIModelsDir, "Set directory where AI model weights are stored")