Skip to content

Commit 07d44d0

Browse files
wang-binwang-bin
committed
ci: update deps & ohos sdk
1 parent 405d58b commit 07d44d0

1 file changed

Lines changed: 46 additions & 46 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- config: lite
5757
target: visionOSSimulator
5858
steps:
59-
- uses: actions/checkout@v5
59+
- uses: actions/checkout@v6
6060
- name: Setup Xcode
6161
run: sudo xcode-select -s /Applications/Xcode_${{ vars.XCODE }}.app
6262
- name: Create Build Environment
@@ -77,7 +77,7 @@ jobs:
7777
shell: bash
7878
run: ./tools/ci-after-build.sh
7979
- name: Archieve SDK
80-
uses: actions/upload-artifact@v4
80+
uses: actions/upload-artifact@v7
8181
with:
8282
name: ffmpeg-${{ env.FF_VERSION }}-${{ env.TARGET_OS }}-${{ matrix.config }}
8383
path: ffmpeg-*.tar.xz
@@ -88,7 +88,7 @@ jobs:
8888
env:
8989
TARGET_OS: 'wasm'
9090
steps:
91-
- uses: actions/checkout@v5
91+
- uses: actions/checkout@v6
9292
- name: Create Build Environment
9393
shell: bash
9494
env:
@@ -104,7 +104,7 @@ jobs:
104104
shell: bash
105105
run: ./tools/ci-after-build.sh
106106
- name: Archieve SDK
107-
uses: actions/upload-artifact@v4
107+
uses: actions/upload-artifact@v7
108108
with:
109109
name: ffmpeg-${{ env.FF_VERSION }}-${{ env.TARGET_OS }}
110110
path: ffmpeg-*.tar.xz
@@ -121,7 +121,7 @@ jobs:
121121
matrix:
122122
config: [lite]
123123
steps:
124-
- uses: actions/checkout@v5
124+
- uses: actions/checkout@v6
125125
- name: 'Restore sysroot cache'
126126
id: sysroot-cache
127127
uses: actions/cache@v4
@@ -145,7 +145,7 @@ jobs:
145145
shell: bash
146146
run: ./tools/ci-after-build.sh
147147
- name: Archieve SDK
148-
uses: actions/upload-artifact@v4
148+
uses: actions/upload-artifact@v7
149149
with:
150150
name: ffmpeg-${{ env.FF_VERSION }}-${{ env.TARGET_OS }}-${{ matrix.config }}
151151
path: ffmpeg-*.tar.xz
@@ -165,7 +165,7 @@ jobs:
165165
- config: default
166166
target: uwp
167167
steps:
168-
- uses: actions/checkout@v5
168+
- uses: actions/checkout@v6
169169
with:
170170
submodules: 'recursive'
171171
- name: Create Build Environment
@@ -220,7 +220,7 @@ jobs:
220220
7z a -ssc -m0=lzma2 -mx=9 -ms=on -mf=off -xr!*.pdb %SDK_NAME%.7z %SDK_NAME%
221221
7z a -ssc -m0=lzma2 -mx=9 -ms=on -mf=off %SDK_NAME%-pdb.7z -ir!%SDK_NAME%\*.pdb
222222
- name: Archieve SDK
223-
uses: actions/upload-artifact@v4
223+
uses: actions/upload-artifact@v7
224224
with:
225225
name: ffmpeg-${{ env.FF_VERSION }}-${{ env.TARGET_OS }}-VS2026${{ matrix.config }}
226226
path: ffmpeg-*.7z
@@ -237,7 +237,7 @@ jobs:
237237
config: [lite,default]
238238
target: [windows-desktop]
239239
steps:
240-
- uses: actions/checkout@v5
240+
- uses: actions/checkout@v6
241241
with:
242242
submodules: 'recursive'
243243
- name: 'Restore dep cache'
@@ -305,7 +305,7 @@ jobs:
305305
7z a -ssc -m0=lzma2 -mx=9 -ms=on -mf=off -xr!*.pdb %SDK_NAME%.7z %SDK_NAME%
306306
7z a -ssc -m0=lzma2 -mx=9 -ms=on -mf=off %SDK_NAME%-pdb.7z -ir!%SDK_NAME%\*.pdb
307307
- name: Archieve SDK
308-
uses: actions/upload-artifact@v4
308+
uses: actions/upload-artifact@v7
309309
with:
310310
name: ffmpeg-${{ env.FF_VERSION }}-${{ env.TARGET_OS }}-VS2026ltl${{ matrix.config }}
311311
path: ffmpeg-*.7z
@@ -324,7 +324,7 @@ jobs:
324324
AMF_DIR: "/tmp/dep/include"
325325
CONFIG_SUFFIX: '-lavfilters'
326326
steps:
327-
- uses: actions/checkout@v5
327+
- uses: actions/checkout@v6
328328
if: ${{ env.FF_VERSION == 'master' }}
329329
with:
330330
submodules: 'recursive'
@@ -360,7 +360,7 @@ jobs:
360360
run: ./tools/ci-after-build.sh
361361
- name: Archieve SDK
362362
if: ${{ env.FF_VERSION == 'master' }}
363-
uses: actions/upload-artifact@v4
363+
uses: actions/upload-artifact@v7
364364
with:
365365
name: ffmpeg-${{ env.FF_VERSION }}-${{ env.TARGET_OS }}-lavfilters
366366
path: ffmpeg-*.tar.xz
@@ -383,7 +383,7 @@ jobs:
383383
config: [lite]
384384
target: [windows-desktop]
385385
steps:
386-
- uses: actions/checkout@v5
386+
- uses: actions/checkout@v6
387387
with:
388388
submodules: 'recursive'
389389
- name: 'Restore sysroot cache'
@@ -413,7 +413,7 @@ jobs:
413413
shell: bash
414414
run: ./tools/ci-after-build.sh
415415
- name: Archieve SDK
416-
uses: actions/upload-artifact@v4
416+
uses: actions/upload-artifact@v7
417417
with:
418418
name: ffmpeg-${{ env.FF_VERSION }}-${{ env.TARGET_OS }}-${{ matrix.config }}
419419
path: ffmpeg-*.tar.xz
@@ -434,7 +434,7 @@ jobs:
434434
matrix:
435435
config: [lite]
436436
steps:
437-
- uses: actions/checkout@v5
437+
- uses: actions/checkout@v6
438438
with:
439439
submodules: 'recursive'
440440
- name: 'Restore sysroot cache'
@@ -463,7 +463,7 @@ jobs:
463463
shell: bash
464464
run: ./tools/ci-after-build.sh
465465
- name: Archieve SDK
466-
uses: actions/upload-artifact@v4
466+
uses: actions/upload-artifact@v7
467467
with:
468468
name: ffmpeg-${{ env.FF_VERSION }}-${{ env.TARGET_OS }}-${{ matrix.config }}-vcrt120
469469
path: ffmpeg-*.tar.xz
@@ -482,7 +482,7 @@ jobs:
482482
matrix:
483483
config: [lite]
484484
steps:
485-
- uses: actions/checkout@v5
485+
- uses: actions/checkout@v6
486486
with:
487487
submodules: 'recursive'
488488
- name: Create Build Environment
@@ -499,7 +499,7 @@ jobs:
499499
shell: bash
500500
run: ./tools/ci-after-build.sh
501501
- name: Archieve SDK
502-
uses: actions/upload-artifact@v4
502+
uses: actions/upload-artifact@v7
503503
with:
504504
name: ffmpeg-${{ env.FF_VERSION }}-${{ env.TARGET_OS }}-${{ matrix.config }}
505505
path: ffmpeg-*.tar.xz
@@ -517,7 +517,7 @@ jobs:
517517
matrix:
518518
config: [default,lite,lite-lto]
519519
steps:
520-
- uses: actions/checkout@v5
520+
- uses: actions/checkout@v6
521521
with:
522522
submodules: 'recursive'
523523
- name: 'Restore sysroot cache'
@@ -544,7 +544,7 @@ jobs:
544544
shell: bash
545545
run: ./tools/ci-after-build.sh
546546
- name: Archieve SDK
547-
uses: actions/upload-artifact@v4
547+
uses: actions/upload-artifact@v7
548548
with:
549549
name: ffmpeg-${{ env.FF_VERSION }}-${{ env.TARGET_OS }}-${{ matrix.config }}
550550
path: ffmpeg-*.tar.xz
@@ -564,7 +564,7 @@ jobs:
564564
matrix:
565565
config: [lite]
566566
steps:
567-
- uses: actions/checkout@v5
567+
- uses: actions/checkout@v6
568568
with:
569569
submodules: 'recursive'
570570
- name: 'Restore sysroot cache'
@@ -591,7 +591,7 @@ jobs:
591591
shell: bash
592592
run: ./tools/ci-after-build.sh
593593
- name: Archieve SDK
594-
uses: actions/upload-artifact@v4
594+
uses: actions/upload-artifact@v7
595595
with:
596596
name: ffmpeg-${{ env.FF_VERSION }}-${{ env.TARGET_OS }}-${{ matrix.config }}
597597
path: ffmpeg-*.tar.xz
@@ -606,7 +606,7 @@ jobs:
606606
matrix:
607607
config: [lite,lite-lto]
608608
steps:
609-
- uses: actions/checkout@v5
609+
- uses: actions/checkout@v6
610610
- name: 'Restore sysroot cache'
611611
id: sysroot-cache
612612
uses: actions/cache@v4
@@ -639,13 +639,13 @@ jobs:
639639
shell: bash
640640
run: ./tools/ci-after-build.sh
641641
- name: Archieve SDK
642-
uses: actions/upload-artifact@v4
642+
uses: actions/upload-artifact@v7
643643
with:
644644
name: ffmpeg-${{ env.FF_VERSION }}-${{ env.TARGET_OS }}-${{ matrix.config }}
645645
path: ffmpeg-*.tar.xz
646646

647647
ohos:
648-
runs-on: ubuntu-latest
648+
runs-on: macos-latest
649649
env:
650650
TARGET_OS: ohos
651651
CONFIG_SUFFIX: -${{ matrix.config }}
@@ -654,28 +654,28 @@ jobs:
654654
matrix:
655655
config: [lite,lite-lto]
656656
steps:
657-
- uses: actions/checkout@v5
658-
- name: Setup HarmonyOS CLI tools
659-
uses: ErBWs/setup-ohos@v1
657+
- uses: actions/checkout@v6
658+
- name: Setup OpenHarmony SDK
659+
id: setup-ohos-sdk
660+
uses: openharmony-rs/setup-ohos-sdk@v1.0.0
660661
with:
661-
version: latest
662+
version: ${{ vars.OH_SDK_VERSION }}
662663
cache: true
663-
- run: hvigorw -v
664664
- name: Create Build Environment
665665
shell: bash
666666
run: ./tools/ci-before-build.sh
667667
- name: Configure and Build
668668
shell: bash
669669
run: |
670-
export OHOS_NDK=$OHOS_NDK_HOME/native
670+
export OHOS_NDK=$OHOS_SDK_NATIVE
671671
export FFSRC=$PWD/ffmpeg-${FF_VERSION}
672672
export USER_OPT="--enable-wolfssl"
673673
./avbuild.sh ${TARGET_OS}12 "arm64"
674674
- name: Make SDK
675675
shell: bash
676676
run: ./tools/ci-after-build.sh
677677
- name: Archieve SDK
678-
uses: actions/upload-artifact@v4
678+
uses: actions/upload-artifact@v7
679679
with:
680680
name: ffmpeg-${{ env.FF_VERSION }}-${{ env.TARGET_OS }}-${{ matrix.config }}
681681
path: ffmpeg-*.tar.xz
@@ -686,35 +686,35 @@ jobs:
686686
needs: [Apple]
687687
steps:
688688
- name: Download iOS
689-
uses: actions/download-artifact@v4
689+
uses: actions/download-artifact@v8
690690
with:
691691
name: ffmpeg-${{ env.FF_VERSION }}-iOS-lite-lto
692692
- name: Download iOSSimulator
693-
uses: actions/download-artifact@v4
693+
uses: actions/download-artifact@v8
694694
with:
695695
name: ffmpeg-${{ env.FF_VERSION }}-iOSSimulator-lite-lto
696696
- name: Download tvOS
697-
uses: actions/download-artifact@v4
697+
uses: actions/download-artifact@v8
698698
with:
699699
name: ffmpeg-${{ env.FF_VERSION }}-tvOS-lite-lto
700700
- name: Download tvOSSimulator
701-
uses: actions/download-artifact@v4
701+
uses: actions/download-artifact@v8
702702
with:
703703
name: ffmpeg-${{ env.FF_VERSION }}-tvOSSimulator-lite-lto
704704
- name: Download visionOS
705-
uses: actions/download-artifact@v4
705+
uses: actions/download-artifact@v8
706706
with:
707707
name: ffmpeg-${{ env.FF_VERSION }}-visionOS-lite-lto
708708
- name: Download visionOSSimulator
709-
uses: actions/download-artifact@v4
709+
uses: actions/download-artifact@v8
710710
with:
711711
name: ffmpeg-${{ env.FF_VERSION }}-visionOSSimulator-lite-lto
712712
- name: Download macOS
713-
uses: actions/download-artifact@v4
713+
uses: actions/download-artifact@v8
714714
with:
715715
name: ffmpeg-${{ env.FF_VERSION }}-macOS-lite-lto
716716
- name: Download macCatalyst
717-
uses: actions/download-artifact@v4
717+
uses: actions/download-artifact@v8
718718
with:
719719
name: ffmpeg-${{ env.FF_VERSION }}-macCatalyst-lite-lto
720720
- name: Gen FFmpeg.framework
@@ -746,7 +746,7 @@ jobs:
746746
cd out
747747
gtar Jcvf ../FFmpeg.xcframework-${{ env.FF_VERSION }}-lite.tar.xz *
748748
- name: Upload Artifact
749-
uses: actions/upload-artifact@v4
749+
uses: actions/upload-artifact@v7
750750
with:
751751
name: FFmpeg.xcframework-${{ env.FF_VERSION }}-lite
752752
path: FFmpeg.xcframework-${{ env.FF_VERSION }}-lite.tar.xz
@@ -763,23 +763,23 @@ jobs:
763763
needs: [VS2026, VS2026LTL]
764764
steps:
765765
- name: Download vs2026 desktop
766-
uses: actions/download-artifact@v4
766+
uses: actions/download-artifact@v8
767767
with:
768768
name: ffmpeg-${{ env.FF_VERSION }}-windows-desktop-VS2026default
769769
- name: Download vs2026 desktop lite
770-
uses: actions/download-artifact@v4
770+
uses: actions/download-artifact@v8
771771
with:
772772
name: ffmpeg-${{ env.FF_VERSION }}-windows-desktop-VS2026lite
773773
- name: Download vs2026 LTL desktop lite
774-
uses: actions/download-artifact@v4
774+
uses: actions/download-artifact@v8
775775
with:
776776
name: ffmpeg-${{ env.FF_VERSION }}-windows-desktop-VS2026ltllite
777777
- name: Download vs2026 LTL desktop
778-
uses: actions/download-artifact@v4
778+
uses: actions/download-artifact@v8
779779
with:
780780
name: ffmpeg-${{ env.FF_VERSION }}-windows-desktop-VS2026ltldefault
781781
- name: Download vs2026 uwp lite
782-
uses: actions/download-artifact@v4
782+
uses: actions/download-artifact@v8
783783
with:
784784
name: ffmpeg-${{ env.FF_VERSION }}-uwp-VS2026lite
785785
- name: Upload to SourceForge

0 commit comments

Comments
 (0)