Skip to content

Commit b01141f

Browse files
wang-binwang-bin
committed
ci: vs2022
1 parent 9a61c06 commit b01141f

File tree

4 files changed

+31
-33
lines changed

4 files changed

+31
-33
lines changed

‎.github/workflows/build.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,8 @@ jobs:
435435
run: sshpass -p ${SF_PW} scp -o StrictHostKeyChecking=no mdk-sdk-${TARGET_OS}.tar.xz ${SF_USER}@frs.sourceforge.net:/home/frs/project/mdk-sdk/nightly/
436436

437437

438-
Windows_VS2019:
439-
runs-on: windows-latest
438+
Windows_VS2022:
439+
runs-on: windows-2022
440440
env:
441441
TARGET_OS: windows-desktop
442442
strategy:
@@ -505,24 +505,24 @@ jobs:
505505
working-directory: mdk
506506
run: |
507507
../ci-after-build.sh
508-
mv mdk-sdk-*.7z ../mdk-sdk-${{ env.TARGET_OS }}-vs2019.7z
508+
mv mdk-sdk-*.7z ../mdk-sdk-${{ env.TARGET_OS }}-vs2022.7z
509509
- name: Archieve SDK
510510
uses: actions/upload-artifact@v2
511511
with:
512-
name: mdk-sdk-vs2019-${{ env.TARGET_OS }}-${{ matrix.config }}
513-
path: mdk-sdk-${{ env.TARGET_OS }}-vs2019.7z
512+
name: mdk-sdk-vs2022-${{ env.TARGET_OS }}-${{ matrix.config }}
513+
path: mdk-sdk-${{ env.TARGET_OS }}-vs2022.7z
514514
# - name: Upload to SourceForge
515515
# if: ${{ matrix.config == 'MinSizeRel' }}
516516
# uses: garygrossgarten/github-action-scp@release
517517
# with:
518518
# host: 'frs.sourceforge.net'
519519
# username: ${{ secrets.SF_USER }}
520520
# password: ${{ secrets.SF_PW }}
521-
# local: mdk-sdk-${{ env.TARGET_OS }}-vs2019.7z
521+
# local: mdk-sdk-${{ env.TARGET_OS }}-vs2022.7z
522522
# remote: '/home/frs/project/mdk-sdk/nightly/'
523523

524-
UWP_VS2019:
525-
runs-on: windows-latest
524+
UWP_VS2022:
525+
runs-on: windows-2022
526526
env:
527527
TARGET_OS: uwp
528528
strategy:
@@ -594,12 +594,12 @@ jobs:
594594
working-directory: mdk
595595
run: |
596596
../ci-after-build.sh
597-
mv mdk-sdk-*.7z ../mdk-sdk-${{ env.TARGET_OS }}-vs2019.7z
597+
mv mdk-sdk-*.7z ../mdk-sdk-${{ env.TARGET_OS }}-vs2022.7z
598598
- name: Archieve SDK
599599
uses: actions/upload-artifact@v2
600600
with:
601-
name: mdk-sdk-vs2019-${{ env.TARGET_OS }}-${{ matrix.config }}
602-
path: mdk-sdk-${{ env.TARGET_OS }}-vs2019.7z
601+
name: mdk-sdk-vs2022-${{ env.TARGET_OS }}-${{ matrix.config }}
602+
path: mdk-sdk-${{ env.TARGET_OS }}-vs2022.7z
603603

604604

605605
Windows_clang:
@@ -804,7 +804,7 @@ jobs:
804804

805805
NuGet:
806806
runs-on: ubuntu-latest
807-
needs: [Windows_clang, UWP_clang, Windows_VS2019, UWP_VS2019]
807+
needs: [Windows_clang, UWP_clang, Windows_VS2022, UWP_VS2022]
808808
steps:
809809
- uses: actions/checkout@v2
810810
- name: Download win32 sdk
@@ -815,14 +815,14 @@ jobs:
815815
uses: actions/download-artifact@v2
816816
with:
817817
name: mdk-sdk-uwp-MinSizeRel
818-
- name: Download win32 vs2019 sdk
818+
- name: Download win32 vs2022 sdk
819819
uses: actions/download-artifact@v2
820820
with:
821-
name: mdk-sdk-vs2019-windows-desktop-MinSizeRel
822-
- name: Download uwp vs2019 sdk
821+
name: mdk-sdk-vs2022-windows-desktop-MinSizeRel
822+
- name: Download uwp vs2022 sdk
823823
uses: actions/download-artifact@v2
824824
with:
825-
name: mdk-sdk-vs2019-uwp-MinSizeRel
825+
name: mdk-sdk-vs2022-uwp-MinSizeRel
826826
- name: Make nupkg (clang)
827827
run: |
828828
7z x mdk-sdk-windows-desktop.7z
@@ -834,18 +834,18 @@ jobs:
834834
cd mdk-sdk
835835
nuget pack mdk.nuspec
836836
mv *.nupkg ../mdk-clang.nupkg
837-
- name: Make nupkg (VS2019)
837+
- name: Make nupkg (VS2022)
838838
run: |
839839
rm -rf mdk-sdk uwp
840-
7z x mdk-sdk-windows-desktop-vs2019.7z
841-
7z x mdk-sdk-uwp-vs2019.7z -o"uwp"
840+
7z x mdk-sdk-windows-desktop-vs2022.7z
841+
7z x mdk-sdk-uwp-vs2022.7z -o"uwp"
842842
mkdir mdk-sdk/bin/UAP
843843
cp -af uwp/mdk-sdk/lib/arm mdk-sdk/lib
844844
cp -af uwp/mdk-sdk/bin/* mdk-sdk/bin/UAP
845845
cp nuget/mdk.nuspec mdk-sdk
846846
cd mdk-sdk
847847
nuget pack mdk.nuspec
848-
mv *.nupkg ../mdk-vs2019.nupkg
848+
mv *.nupkg ../mdk-vs2022.nupkg
849849
- name: Archieve SDK
850850
uses: actions/upload-artifact@v2
851851
with:
@@ -856,7 +856,7 @@ jobs:
856856
run: |
857857
sudo apt update
858858
sudo apt install -y sshpass
859-
for f in mdk-sdk-windows-desktop-vs2019.7z mdk-sdk-uwp-vs2019.7z mdk-vs2019.nupkg; do
859+
for f in mdk-sdk-windows-desktop-vs2022.7z mdk-sdk-uwp-vs2022.7z mdk-vs2022.nupkg; do
860860
sshpass -p ${SF_PW} scp -o StrictHostKeyChecking=no $f ${SF_USER}@frs.sourceforge.net:/home/frs/project/mdk-sdk/nightly/
861861
done
862862

‎README.WinRT.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717

1818

1919
## About SDK for Windows Store
20-
SDK is built by clang-cl 12.0 + lld with
21-
- [FFmpeg](https://sourceforge.net/projects/avbuild/files/windows-store/ffmpeg-master-windows-store-clang-static-lite.tar.xz/download)
22-
- Windows SDK 10.0.19041.0
23-
- MSVC CRT 14.28.29333
20+
SDK is built by
21+
- clang-cl 13.0 + lld, with Windows SDK 10.0.19041.0, MSVC CRT 14.28.29333, [FFmpeg](https://sourceforge.net/projects/avbuild/files/uwp/ffmpeg-master-uwp-vs2022-lite.tar.xz/download)
22+
- latest vs2022 with [FFmpeg](https://sourceforge.net/projects/avbuild/files/uwp/ffmpeg-master-uwp-vs2022-lite.tar.xz/download)
2423

2524
### Use in Visual Studio
2625
#### Install via NuGet (Recommended)

‎README.Windows.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@
1818
- [Smart FFmpeg runtime, dynamic load, compatible with 4.x/5.x abi](https://github.com/wang-bin/mdk-sdk/wiki/FFmpeg-Runtime)
1919

2020
## About SDK for Windows Desktop
21-
SDK is built by clang-cl 12.0 + lld with
22-
- [FFmpeg master](https://sourceforge.net/projects/avbuild/files/windows-desktop/ffmpeg-master-windows-desktop-clang-lite.tar.xz/download)
23-
- Windows SDK 10.0.19041.0
24-
- MSVC CRT 14.28.29333
21+
SDK is built by
22+
- clang-cl 13.0 + lld, with Windows SDK 10.0.19041.0, MSVC CRT 14.28.29333, [FFmpeg](https://sourceforge.net/projects/avbuild/files/windows-store/ffmpeg-master-windows-desktop-vs2022-lite.tar.xz/download)
23+
- latest vs2022 with [FFmpeg](https://sourceforge.net/projects/avbuild/files/windows-store/ffmpeg-master-windows-desktop-vs2022-lite.tar.xz/download)
2524

26-
SDK can be used by any C or C++11 compiler, e.g. vs2015, vs2019, mingw g++, clang
25+
SDK can be used by any C or C++11 compiler, e.g. vs2015, vs2022, mingw g++, clang
2726

2827
### Use in Visual Studio
2928

‎ci-before-build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if [[ "$TARGET_OS" == mac* || "$TARGET_OS" == iOS* || "$TARGET_OS" == android ]]
1212
FF_EXTRA=
1313
fi
1414
if [[ "$TARGET_OS" == "win"* || "$TARGET_OS" == "uwp"* ]]; then
15-
FF_EXTRA=-vs2019
15+
FF_EXTRA=-vs2022
1616
FFPKG_EXT=7z
1717
fi
1818
if [ `which dpkg` ]; then # TODO: multi arch
@@ -117,9 +117,9 @@ if [[ "$SYSROOT_CACHE_HIT" != "true" ]]; then
117117
fi
118118

119119
if [ "$TARGET_OS" == "android" -a ! -d "$ANDROID_NDK_LATEST_HOME" ]; then
120-
wget https://dl.google.com/android/repository/android-ndk-${NDK_VERSION:-r23}-${NDK_HOST}-x86_64.zip -O ndk.zip
120+
wget https://dl.google.com/android/repository/android-ndk-${NDK_VERSION:-r23b}-${NDK_HOST}-x86_64.zip -O ndk.zip
121121
7z x ndk.zip -o/tmp &>/dev/null
122-
mv /tmp/android-ndk-${NDK_VERSION:-r23} ${ANDROID_NDK:-/tmp/android-ndk}
122+
mv /tmp/android-ndk-${NDK_VERSION:-r23b} ${ANDROID_NDK:-/tmp/android-ndk}
123123
fi
124124
fi
125125

0 commit comments

Comments
 (0)