Skip to content
This repository has been archived by the owner on Oct 9, 2024. It is now read-only.

Commit

Permalink
ci: remove ffmpeg step
Browse files Browse the repository at this point in the history
  • Loading branch information
alexmercerind authored Jul 18, 2023
1 parent c3e433d commit 8c5e628
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/mpv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -247,11 +247,11 @@ jobs:
}
}
let { stdout: ffmpeg_hash } = await exec.getExecOutput("git -C mpv-winbuild-cmake/src_packages/ffmpeg rev-parse --short HEAD");
ffmpeg_hash = ffmpeg_hash.trim();
const ffmpeg_name = `ffmpeg-${arch}-git-${ffmpeg_hash}`;
core.exportVariable( 'ffmpeg_name', ffmpeg_name );
await exec.exec(`7z a -m0=lzma2 -mx=9 -ms=on mpv-winbuild-cmake/release/${ffmpeg_name}.7z ./mpv-winbuild-cmake/build${{ matrix.bit }}/install/mingw/bin/ffmpeg.exe`)
// let { stdout: ffmpeg_hash } = await exec.getExecOutput("git -C mpv-winbuild-cmake/src_packages/ffmpeg rev-parse --short HEAD");
// ffmpeg_hash = ffmpeg_hash.trim();
// const ffmpeg_name = `ffmpeg-${arch}-git-${ffmpeg_hash}`;
// core.exportVariable( 'ffmpeg_name', ffmpeg_name );
// await exec.exec(`7z a -m0=lzma2 -mx=9 -ms=on mpv-winbuild-cmake/release/${ffmpeg_name}.7z ./mpv-winbuild-cmake/build${{ matrix.bit }}/install/mingw/bin/ffmpeg.exe`)
- name: upload mpv-debug
uses: actions/upload-artifact@v3
Expand All @@ -272,12 +272,12 @@ jobs:
name: ${{ env.mpv_name }}
path: ${{ env.mpv_path }}

- name: upload ffmpeg
uses: actions/upload-artifact@v3
if: ${{ env.ffmpeg_name }}
with:
name: ${{ env.ffmpeg_name }}
path: mpv-winbuild-cmake/release/${{ env.ffmpeg_name }}.7z
# - name: upload ffmpeg
# uses: actions/upload-artifact@v3
# if: ${{ env.ffmpeg_name }}
# with:
# name: ${{ env.ffmpeg_name }}
# path: mpv-winbuild-cmake/release/${{ env.ffmpeg_name }}.7z

- name: Save Sources Cache
if: ${{ github.ref_name == 'main' }}
Expand Down Expand Up @@ -420,7 +420,7 @@ jobs:
- name: Create release
uses: ncipollo/release-action@v1
with:
artifacts: "artifacts/*/mpv*.7z,artifacts/*/ffmpeg*.7z"
artifacts: "artifacts/*/mpv*.7z" # "artifacts/*/mpv*.7z,artifacts/*/ffmpeg*.7z"
commit: version
name: "${{ env.short_time }}"
body: "https://github.com/mpv-player/mpv/commit/${{ fromJson(needs.params.outputs.params).sha }}"
Expand Down

0 comments on commit 8c5e628

Please sign in to comment.