Skip to content

Commit c8bfd79

Browse files
committed
Update patch
Signed-off-by: Isaac Marovitz <[email protected]>
1 parent 87aef2e commit c8bfd79

File tree

2 files changed

+332
-284
lines changed

2 files changed

+332
-284
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ name: C/C++ CI
44
on: [push]
55

66
jobs:
7-
87
build:
98
name: ${{ matrix.build }} ${{ matrix.arch }}
109
runs-on: ${{ matrix.os }}
@@ -78,7 +77,7 @@ jobs:
7877
run: |
7978
(cd ${{ matrix.vcpkg-root }} && git fetch origin)
8079
(cd ${{ matrix.vcpkg-root }} && git reset --hard)
81-
(cd ${{ matrix.vcpkg-root }} && git checkout df8bfe519564ae001903e5cdd32af0999531ef71)
80+
(cd ${{ matrix.vcpkg-root }} && git checkout 7087dcfba66c8da4acb50b09ea680b4e9050a4e9)
8281
(cd ${{ matrix.vcpkg-root }} && git apply --ignore-space-change --ignore-whitespace --3way ${{ github.workspace }}/ffmpeg.patch)
8382
8483
- name: Bootstrap vcpkg (windows-latest)
@@ -88,14 +87,14 @@ jobs:
8887

8988
- name: Build ffmpeg
9089
run: |
91-
vcpkg ${{ matrix.extra-args }} install ffmpeg[avcodec,avfilter,avdevice,avformat,swresample,swscale]:${{ matrix.arch }}-${{ matrix.triplet }}
90+
vcpkg ${{ matrix.extra-args }} install ffmpeg[avcodec,avfilter,avdevice,avformat,swresample,swscale]:${{ matrix.arch }}-${{ matrix.triplet }}
9291
if: matrix.triplet != 'mingw-static'
9392

9493
- name: Build ffmpeg (x64-mingw-static)
9594
shell: msys2 {0}
9695
run: |
97-
export PATH=$(cygpath '${{ matrix.vcpkg-root }}'):$PATH
98-
vcpkg ${{ matrix.extra-args }} install ffmpeg[avcodec,avfilter,avdevice,avformat,swresample,swscale]:${{ matrix.arch }}-${{ matrix.triplet }}
96+
export PATH=$(cygpath '${{ matrix.vcpkg-root }}'):$PATH
97+
vcpkg ${{ matrix.extra-args }} install ffmpeg[avcodec,avfilter,avdevice,avformat,swresample,swscale]:${{ matrix.arch }}-${{ matrix.triplet }}
9998
if: matrix.triplet == 'mingw-static'
10099

101100
- uses: actions/upload-artifact@v4
@@ -110,13 +109,13 @@ jobs:
110109
if: github.ref == 'refs/heads/master'
111110
permissions:
112111
contents: write
113-
112+
114113
steps:
115114
- uses: actions/checkout@v4
116115

117116
- name: Download Artifacts
118117
uses: actions/download-artifact@v4
119-
118+
120119
- name: Compute short git commit SHA
121120
run: |
122121
echo "COMMIT_SHORT_SHA=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_ENV

0 commit comments

Comments
 (0)