diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml index b89efcbd69..89e5c40475 100644 --- a/.github/workflows/android-app.yml +++ b/.github/workflows/android-app.yml @@ -45,7 +45,7 @@ jobs: java-version: 17 - name: Install NDK - run: echo "y" | sudo ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;24.0.8215888" --sdk_root=${ANDROID_SDK_ROOT} + run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;24.0.8215888" --sdk_root=${ANDROID_SDK_ROOT} # - name: Rust Cache # uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7 @@ -100,7 +100,7 @@ jobs: java-version: 17 - name: Install NDK - run: echo "y" | sudo ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;24.0.8215888" --sdk_root=${ANDROID_SDK_ROOT} + run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;24.0.8215888" --sdk_root=${ANDROID_SDK_ROOT} # - name: Rust Cache # uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7 diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml index a53d7d3586..5ca08248ef 100644 --- a/.github/workflows/android-release.yml +++ b/.github/workflows/android-release.yml @@ -41,7 +41,7 @@ jobs: java-version: 17 - name: Install NDK - run: echo "y" | sudo ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;24.0.8215888" --sdk_root=${ANDROID_SDK_ROOT} + run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;24.0.8215888" --sdk_root=${ANDROID_SDK_ROOT} # - name: Rust Cache # uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7 @@ -96,7 +96,7 @@ jobs: java-version: 17 - name: Install NDK - run: echo "y" | sudo ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;24.0.8215888" --sdk_root=${ANDROID_SDK_ROOT} + run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;24.0.8215888" --sdk_root=${ANDROID_SDK_ROOT} # - name: Rust Cache # uses: Swatinem/rust-cache@27b8ea9368cf428f0bfe41b0876b1a7e809d9844 # v2.7.7 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 3479826ff1..8389f2e571 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -18,6 +18,9 @@ jobs: image: ghcr.io/${{ github.repository }}/opencv-builder:4.11.0 steps: + - name: Install Rust stable toolchain + uses: dtolnay/rust-toolchain@stable + - name: Checkout sources uses: actions/checkout@v4.1.1 with: diff --git a/.github/workflows/opencv-docker.yml b/.github/workflows/opencv-docker.yml index c0d2a96a0d..044bdf0aa8 100644 --- a/.github/workflows/opencv-docker.yml +++ b/.github/workflows/opencv-docker.yml @@ -3,10 +3,10 @@ name: Build OpenCV Docker Image on: workflow_dispatch: push: - # paths: - # - 'docker/opencv.Dockerfile' - # branches: - # - master + paths: + - 'docker/opencv.Dockerfile' + branches: + - master jobs: build-and-push: