Fix heif step name + Ignore docker cache while building in CI

spacedriveapp · Oct 27, 2023 · 9a4b7a6 · 9a4b7a6
1 parent cf7c2fd
commit 9a4b7a6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/scripts/ffmpeg/Dockerfile b/.github/scripts/ffmpeg/Dockerfile
@@ -314,7 +314,7 @@ RUN --mount=src=scripts/99-ffmpeg.sh,dst=/srv/stage.sh /srv/build.sh
 
 FROM layer-50 AS layer-99-heif
 
-RUN --mount=src=scripts/99-libheif.sh,dst=/srv/stage.sh /srv/build.sh
+RUN --mount=src=scripts/99-heif.sh,dst=/srv/stage.sh /srv/build.sh
 
 FROM layer-50 AS layer-99
 

diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml
@@ -56,11 +56,11 @@ jobs:
         run: |
           set -euxo pipefail
           cd .github/scripts/ffmpeg
-          docker build --build-arg TARGET=${{ matrix.settings.target }} -o . .
+          docker build --no-cache --build-arg TARGET=${{ matrix.settings.target }} -o . .
 
-      - name: Publish ffmpeg x86_64
+      - name: Publish ffmpeg
         uses: actions/upload-artifact@v3
         with:
-          name: ffmpeg-6.0-x86_64
-          path: .github/scripts/ffmpeg-windows/dlls/*
+          name: ffmpeg-6.0-${{ matrix.settings.target }}
+          path: .github/scripts/ffmpeg/out/*
           if-no-files-found: error