From 5f09d24d0ef438206c44d6505d218bf4af649346 Mon Sep 17 00:00:00 2001 From: wang-bin Date: Mon, 8 Jul 2024 17:29:59 +0800 Subject: [PATCH] update ci & pod --- .github/workflows/build.yml | 16 +++++++--------- ci-before-build.sh | 2 +- mdk.podspec | 4 ++-- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c9cf49e..02dd687 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ env: jobs: macOS: # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/configuring-a-workflow#configuring-a-build-matrix - runs-on: macos-14 + runs-on: macos-latest env: TARGET_OS: 'macOS' TARGET_ARCH: ${{ matrix.arch }} @@ -98,7 +98,7 @@ jobs: sshpass -p ${SF_PW} scp -o StrictHostKeyChecking=no mdk-sdk-${TARGET_OS}-${{ matrix.arch }}.tar.xz ${SF_USER}@frs.sourceforge.net:/home/frs/project/mdk-sdk/nightly/ iOS: - runs-on: macos-14 + runs-on: macos-latest env: TARGET_OS: ${{ matrix.os }}${{ matrix.simulator }} LTO_SUFFIX: -lto @@ -188,7 +188,7 @@ jobs: 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/ Apple: - runs-on: macos-14 + runs-on: macos-latest needs: [macOS, iOS] steps: - name: Setup Xcode @@ -853,7 +853,7 @@ jobs: sshpass -p ${SF_PW} scp -o StrictHostKeyChecking=no mdk-*.md5 ${SF_USER}@frs.sourceforge.net:/home/frs/project/mdk-sdk/nightly/ Android: - runs-on: ubuntu-latest + runs-on: macos-latest env: FF_VER: 6.1 # 7.0 and master is very slow in avformat_find_stream_info TARGET_OS: android @@ -887,16 +887,14 @@ jobs: # SYSROOT_CACHE_HIT: ${{ steps.sysroot-cache.outputs.cache-hit }} EXTERNAL_DEP_CACHE_HIT: ${{ steps.external-dep-cache.outputs.cache-hit }} working-directory: mdk - run: | - sudo apt update - ../ci-before-build.sh + run: ../ci-before-build.sh - name: Configure for armeabi-v7a env: ARCH: armeabi-v7a MIN_API: 19 # android 4.4. ndk25 shell: bash working-directory: mdk - run: cmake -DUSE_LTO=1 -DANDROID_LD=lld -DANDROID_ABI=${ARCH} -DANDROID_PLATFORM=android-${MIN_API} -DANDROID_TOOLCHAIN=clang -DANDROID_STL=c++_shared -DANDROID_PIE=ON -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake -GNinja -H$PWD -B$PWD/build/${TARGET_OS}-${ARCH} -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DCMAKE_INSTALL_PREFIX=$PWD/mdk-sdk-${ARCH} -DCMAKE_VERBOSE_MAKEFILE=1 + run: cmake -DUSE_LTO=1 -DANDROID_LD=lld -DANDROID_ABI=${ARCH} -DANDROID_PLATFORM=android-${MIN_API} -DANDROID_TOOLCHAIN=clang -DANDROID_STL=c++_shared -DANDROID_PIE=ON -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk/25.2.9519653/build/cmake/android.toolchain.cmake -GNinja -H$PWD -B$PWD/build/${TARGET_OS}-${ARCH} -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DCMAKE_INSTALL_PREFIX=$PWD/mdk-sdk-${ARCH} -DCMAKE_VERBOSE_MAKEFILE=1 - name: Build for armeabi-v7a shell: bash working-directory: mdk @@ -920,7 +918,7 @@ jobs: MIN_API: 19 # android 4.4. ndk25 shell: bash working-directory: mdk - run: cmake -DUSE_LTO=1 -DANDROID_LD=lld -DANDROID_ABI=${ARCH} -DANDROID_PLATFORM=android-${MIN_API} -DANDROID_TOOLCHAIN=clang -DANDROID_STL=c++_shared -DANDROID_PIE=ON -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake -GNinja -H$PWD -B$PWD/build/${TARGET_OS}-${ARCH} -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DCMAKE_INSTALL_PREFIX=$PWD/mdk-sdk-${ARCH} -DCMAKE_VERBOSE_MAKEFILE=1 + run: cmake -DUSE_LTO=1 -DANDROID_LD=lld -DANDROID_ABI=${ARCH} -DANDROID_PLATFORM=android-${MIN_API} -DANDROID_TOOLCHAIN=clang -DANDROID_STL=c++_shared -DANDROID_PIE=ON -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk/25.2.9519653/build/cmake/android.toolchain.cmake -GNinja -H$PWD -B$PWD/build/${TARGET_OS}-${ARCH} -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DCMAKE_INSTALL_PREFIX=$PWD/mdk-sdk-${ARCH} -DCMAKE_VERBOSE_MAKEFILE=1 - name: Build for x86 shell: bash working-directory: mdk diff --git a/ci-before-build.sh b/ci-before-build.sh index f5c4b0a..143b9f4 100755 --- a/ci-before-build.sh +++ b/ci-before-build.sh @@ -44,7 +44,7 @@ elif [ `which brew` ]; then export HOMEBREW_NO_AUTO_UPDATE=true #time brew update --preinstall export HOMEBREW_NO_AUTO_UPDATE=1 - pkgs="ninja vulkan-headers dav1d" # p7zip gnu-tar + pkgs="ninja vulkan-headers dav1d md5sha1sum" # p7zip gnu-tar #pkgs+=" cmake" # visionOS simulator requires cmake 3.28.4 if [[ "$DEVTOOLS_CACHE_HIT" != "true" ]]; then pkgs+=" hudochenkov/sshpass/sshpass" diff --git a/mdk.podspec b/mdk.podspec index 62d45b7..9bd67b5 100644 --- a/mdk.podspec +++ b/mdk.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'mdk' - s.version = '0.29.0' + s.version = '0.29.1' s.summary = 'Multimedia Development Kit' s.homepage = 'https://github.com/wang-bin/mdk-sdk' @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.tvos.deployment_target = '12.0' s.visionos.deployment_target = '1.0' s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=*simulator*]' => 'i386'} - s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=*simulator*]' => 'i386', 'OTHER_CODE_SIGN_FLAGS' => '$(inherited) --deep'} + s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=*simulator*]' => 'i386'} s.visionos.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=*simulator*]' => 'x86_64'} # optional? s.visionos.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=*simulator*]' => 'x86_64'} # s.user_target_xcconfig = { 'VALID_ARCHS[sdk=iphonesimulator*]' => '' }