Skip to content

Commit

Permalink
Merge branch 'master' into add_proposal_vote_cli_arg
Browse files Browse the repository at this point in the history
  • Loading branch information
thomshutt authored Jan 6, 2025
2 parents 0017861 + 1dfe3fd commit 86714fa
Show file tree
Hide file tree
Showing 58 changed files with 2,024 additions and 1,184 deletions.
6 changes: 3 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ end_of_line = unset
insert_final_newline = unset

# Makefiles/Dockerfile/golang files
[{Makefile,Dockerfile{,.debian},*.go}]
[{Makefile,Dockerfile{,.cuda-base,.mediamtx},*.go}]
indent_style = tab
indent_size = 8

# YAML/JSON Files
[{.ecrc,*.{yml,yaml,sh,json}}]
# YAML/JSON/sh Files
[{.ecrc,*.{yml,yaml,sh,json,bash}}]
indent_size = 2

[{server/handlers_test,eth/accountmanager_test}.go]
Expand Down
5 changes: 5 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ docker:
- any-glob-to-any-file:
- "docker/**"

docs:
- changed-files:
- any-glob-to-any-file:
- "doc/**"

github_actions:
- changed-files:
- any-glob-to-any-file:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
id: go
uses: actions/setup-go@v5
with:
go-version: 1.23.2
go-version-file: './go.mod'
cache: true
cache-dependency-path: go.sum

Expand Down Expand Up @@ -174,7 +174,7 @@ jobs:
id: go
uses: actions/setup-go@v5
with:
go-version: 1.23.2
go-version-file: './go.mod'
cache: true
cache-dependency-path: go.sum

Expand All @@ -196,7 +196,7 @@ jobs:
- name: Install dependencies
run: |
brew update
brew upgrade
# brew upgrade # temporarily disabled because of the issues it's causing
brew uninstall --ignore-dependencies --force [email protected]
brew install coreutils pkgconf
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/docker-mediamtx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@ name: MediaMTX Docker build

on:
pull_request:
branches:
- master
paths:
- 'docker/*mediamtx*'
push:
branches:
- master
paths:
- 'docker/Dockerfile.mediamtx'
- 'docker/mediamtx.yml'
- 'docker/*mediamtx*'

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
Expand All @@ -20,7 +23,7 @@ jobs:
permissions:
packages: write
contents: read
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
id: go
uses: actions/setup-go@v5
with:
go-version: 1.23.2
go-version-file: './go.mod'
cache: true
cache-dependency-path: go.sum

Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Changelog

## v0.8.1

- [#3279](https://github.com/livepeer/go-livepeer/pull/3279) Enable automatic worker image pulling.
- Live Video AI features
- [#3249](https://github.com/livepeer/go-livepeer/pull/3249) Add Gateway ETH Address to Kafka events

### Features ⚒

#### Broadcaster

### Bug Fixes 🐞

#### Broadcaster

## v0.8.0

- [#2959](https://github.com/livepeer/go-livepeer/pull/2959) Add Livepeer AI Subnet features
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG_PENDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#### General

#### Broadcaster
- [#3321](https://github.com/livepeer/go-livepeer/pull/3321) Add orchestrator info on live AI monitoring events

#### Orchestrator

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.8.0
0.8.1
2 changes: 1 addition & 1 deletion cmd/devtool/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ docker run -p 8545:8545 -p 8546:8546 --name geth-with-livepeer-protocol livepeer
This command will submit the setup transactions for a broadcaster and generate the Bash script
`run_broadcaster_<ETH_ACCOUNT>.sh` which can be used to start a broadcaster node.

### Step 3: Set up a orchestrator/transcoder
### Step 3: Set up an orchestrator/transcoder

`go run cmd/devtool/devtool.go setup transcoder`

Expand Down
7 changes: 6 additions & 1 deletion cmd/livepeer/livepeer.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ func parseLivepeerConfig() starter.LivepeerConfig {
cfg.IgnoreMaxPriceIfNeeded = flag.Bool("ignoreMaxPriceIfNeeded", *cfg.IgnoreMaxPriceIfNeeded, "Set to true to allow exceeding max price condition if there is no O that meets this requirement")
cfg.MinPerfScore = flag.Float64("minPerfScore", *cfg.MinPerfScore, "The minimum orchestrator's performance score a broadcaster is willing to accept")
cfg.DiscoveryTimeout = flag.Duration("discoveryTimeout", *cfg.DiscoveryTimeout, "Time to wait for orchestrators to return info to be included in transcoding sessions for manifest (default = 500ms)")
cfg.GatewayHost = flag.String("gatewayHost", *cfg.GatewayHost, "External hostname on which the Gateway node is running. Used when telling external services how to reach the node.")

// Transcoding:
cfg.Orchestrator = flag.Bool("orchestrator", *cfg.Orchestrator, "Set to true to be an orchestrator")
Expand All @@ -162,8 +163,12 @@ func parseLivepeerConfig() starter.LivepeerConfig {
cfg.AIModelsDir = flag.String("aiModelsDir", *cfg.AIModelsDir, "Set directory where AI model weights are stored")
cfg.AIRunnerImage = flag.String("aiRunnerImage", *cfg.AIRunnerImage, "Set the docker image for the AI runner: Example - livepeer/ai-runner:0.0.1")

// Live AI Media Server:
// Live AI:
cfg.MediaMTXApiPassword = flag.String("mediaMTXApiPassword", "", "HTTP basic auth password for MediaMTX API requests")
cfg.LiveAITrickleHostForRunner = flag.String("liveAITrickleHostForRunner", "", "Trickle Host used by AI Runner; It's used to overwrite the publicly available Trickle Host")
cfg.LiveAIAuthApiKey = flag.String("liveAIAuthApiKey", "", "API key to use for Live AI authentication requests")
cfg.LiveAIAuthWebhookURL = flag.String("liveAIAuthWebhookUrl", "", "Live AI RTMP authentication webhook URL")
cfg.LivePaymentInterval = flag.Duration("livePaymentInterval", *cfg.LivePaymentInterval, "Interval to pay process Gateway <> Orchestrator Payments for Live AI Video")

// Onchain:
cfg.EthAcctAddr = flag.String("ethAcctAddr", *cfg.EthAcctAddr, "Existing Eth account address. For use when multiple ETH accounts exist in the keystore directory")
Expand Down
Loading

0 comments on commit 86714fa

Please sign in to comment.