Merge branch 'main' into eli/static-ffmpeg

livepeer · Oct 24, 2023 · ee2130d · ee2130d
2 parents 694342b + 6ec1374
commit ee2130d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/catalyst.yaml b/.github/workflows/catalyst.yaml
@@ -67,21 +67,21 @@ jobs:
 
     steps:
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
         if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository }}
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.CI_DOCKERHUB_USERNAME }}
           password: ${{ secrets.CI_DOCKERHUB_TOKEN }}
 
       - name: Log in to the Container registry
         if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository }}
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -107,7 +107,7 @@ jobs:
             type=raw,value=${{ (github.event_name == 'pull_request' && github.head_ref) || github.ref_name }}
 
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           platforms: ${{ matrix.targets.platforms }}
           push: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository }}

diff --git a/manifest.yaml b/manifest.yaml
@@ -24,7 +24,7 @@ box:
     strategy:
       download: bucket
       project: catalyst-api
-      commit: 3356c1bff1316ffa0c7350a45172ea228a21841e
+      commit: 181d693084ccf37bc98adfcc6fcf1d19d881d783
     release: main
     srcFilenames:
       darwin-amd64: livepeer-catalyst-api-darwin-amd64.tar.gz
@@ -35,7 +35,7 @@ box:
     strategy:
       download: bucket
       project: catalyst-uploader
-      commit: 7306780f60c52e64abaf6486f144e494a90d4623
+      commit: de93a9a7ad2d3d1d6f36615f44b1a9da5958a17c
     binary: livepeer-catalyst-uploader
     release: main
     srcFilenames:
@@ -47,7 +47,7 @@ box:
     strategy:
       download: bucket
       project: go-livepeer
-      commit: 32d5d45e3cd30a2a5563b1995b776b9fabe74b39
+      commit: 1c2ce0737109c58f24e7f10b2373c4b1080e1b7a
     binary: livepeer
     release: master
     archivePath: livepeer
@@ -81,7 +81,7 @@ box:
     strategy:
       download: bucket
       project: task-runner
-      commit: d8fa8b655bee6b02446895731319dc5d7b11e6cc
+      commit: f38d4425913e83436e50062b1633c85bfe4e1607
     binary: livepeer-task-runner
     release: main
     srcFilenames: