Merge branch 'master' of https://github.com/BtbN/FFmpeg-Builds

MartinEesmaa · Jan 13, 2025 · 1f013d3 · 1f013d3
2 parents 87174c4 + e338f23
commit 1f013d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -67,7 +67,7 @@ jobs:
       - name: Stop Commands
         run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
       - name: Build target base image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/base
           pull: true
@@ -136,7 +136,7 @@ jobs:
       - name: Stop Commands
         run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
       - name: Build target base image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: images/base-${{ matrix.target }}
           pull: true
@@ -203,7 +203,7 @@ jobs:
           key: download-cache-${{ steps.dl_cache.outputs.dltagname }}
           fail-on-cache-miss: true
       - name: Build target base image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           pull: true

diff --git a/scripts.d/50-snappy.sh b/scripts.d/50-snappy.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-SCRIPT_REPO="https://github.com/google/snappy"
+SCRIPT_REPO="https://github.com/google/snappy.git"
+SCRIPT_COMMIT="32ded457c0b1fe78ceb8397632c416568d6714a0"
 
 ffbuild_enabled() {
     return 0