fix

rainyl · Sep 24, 2024 · 4d616aa · 4d616aa
1 parent 4027b78
commit 4d616aa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -15,7 +15,6 @@ jobs:
         abi: [armeabi-v7a, arm64-v8a, x86_64]
     env:
       COMMON_CMAKE_OPTIONS: |
-        -G Ninja \
         -DCMAKE_POLICY_DEFAULT_CMP0057=NEW \
         -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake \
         -DANDROID_USE_LEGACY_TOOLCHAIN_FILE=False \

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -32,14 +32,14 @@ jobs:
         -DCMAKE_SYSTEM_NAME=Windows `
         -DCMAKE_SYSTEM_PROCESSOR=${{ matrix.os.arch }} `
         $(type ${{ github.workspace }}/options.txt) `
-        -DFFMPEG_ARCH=${{ matrix.os.arch }}
+        -DFFMPEG_ARCH=${{ matrix.os.arch }} `
     steps:
       - uses: actions/checkout@v4
       - name: setup-opencv-source
         run: |
           git clone -b ${{ matrix.opencv-version }} https://github.com/opencv/opencv.git opencv
           git clone -b ${{ matrix.opencv-version }} https://github.com/opencv/opencv_contrib.git opencv_contrib
-          echo "SOURCE_DIR=opencv" >> "$GITHUB_ENV"
+          echo "SOURCE_DIR=${{ github.workspace }}/opencv" >> "$GITHUB_ENV"
           echo "PACKAGE_NAME=libopencv-windows-${{ matrix.os.arch }}" >> "$GITHUB_ENV"
       - name: setup ffmpeg
         run: |