-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ported Android environment update to 5.x (#219)
- Loading branch information
1 parent
e493f3d
commit b15d6fc
Showing
1 changed file
with
5 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,7 +33,7 @@ jobs: | |
run: | ||
shell: bash | ||
container: | ||
image: quay.io/opencv-ci/opencv-androidsdk-30:20240213 | ||
image: quay.io/opencv-ci/opencv-androidsdk-34:20240917 | ||
volumes: | ||
- /home/opencv-cn/git_cache:/home/ci/git_cache | ||
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache | ||
|
@@ -79,7 +79,7 @@ jobs: | |
mkdir -p /home/ci/build | ||
cd /home/ci/build | ||
sed -i 's+https\\://services.gradle.org/distributions/gradle-@[email protected]+file\\:/opt/gradle/gradle-@[email protected]+g' ${{ env.OPENCV_DOCKER_WORKDIR }}/platforms/android/gradle-wrapper/gradle/wrapper/gradle-wrapper.properties.in | ||
python3 "${{ env.OPENCV_DOCKER_WORKDIR }}/platforms/android/build_sdk.py" --build_doc --config "${{ env.OPENCV_DOCKER_WORKDIR }}/platforms/android/ndk-18-api-level-21.config.py" --sdk_path "$ANDROID_HOME" --ndk_path "$ANDROID_NDK_HOME" /home/ci/build | tee /home/ci/build/build-log.txt | ||
python3 "${{ env.OPENCV_DOCKER_WORKDIR }}/platforms/android/build_sdk.py" --build_doc --config "${{ env.OPENCV_DOCKER_WORKDIR }}/platforms/android/default.config.py" --sdk_path "$ANDROID_HOME" --ndk_path "$ANDROID_NDK_HOME" /home/ci/build | tee /home/ci/build/build-log.txt | ||
- name: Warning check | ||
timeout-minutes: 60 | ||
run: cd /home/ci/build && python3 /home/ci/scripts/warnings-handling.py | ||
|
@@ -90,13 +90,13 @@ jobs: | |
timeout-minutes: 60 | ||
run: | | ||
cd /home/ci/build | ||
sed -i 's+https\\://services.gradle.org/distributions/gradle-7.6.3-bin.zip+file\\:/opt/gradle/gradle-7.6.3-bin.zip+g' ${{ env.OPENCV_DOCKER_WORKDIR }}/platforms/android/aar-template/gradle/wrapper/gradle-wrapper.properties | ||
sed -i 's+https\\://services.gradle.org/distributions/gradle-8.11.1-bin.zip+file\\:/opt/gradle/gradle-8.11.1-bin.zip+g' ${{ env.OPENCV_DOCKER_WORKDIR }}/platforms/android/aar-template/gradle/wrapper/gradle-wrapper.properties | ||
python3 "${{ env.OPENCV_DOCKER_WORKDIR }}/platforms/android/build_java_shared_aar.py" --ndk_location="$ANDROID_NDK_HOME" --cmake_location=$(dirname $(dirname $(which cmake))) /home/ci/build/OpenCV-android-sdk | ||
- name: Build Static AAR | ||
timeout-minutes: 60 | ||
run: | | ||
cd /home/ci/build | ||
sed -i 's+https\\://services.gradle.org/distributions/gradle-7.6.3-bin.zip+file\\:/opt/gradle/gradle-7.6.3-bin.zip+g' ${{ env.OPENCV_DOCKER_WORKDIR }}/platforms/android/aar-template/gradle/wrapper/gradle-wrapper.properties | ||
sed -i 's+https\\://services.gradle.org/distributions/gradle-8.11.1-bin.zip+file\\:/opt/gradle/gradle-8.11.1-bin.zip+g' ${{ env.OPENCV_DOCKER_WORKDIR }}/platforms/android/aar-template/gradle/wrapper/gradle-wrapper.properties | ||
python3 "${{ env.OPENCV_DOCKER_WORKDIR }}/platforms/android/build_static_aar.py" --ndk_location="$ANDROID_NDK_HOME" --cmake_location=$(dirname $(dirname $(which cmake))) /home/ci/build/OpenCV-android-sdk | ||
- name: Test CMake | ||
timeout-minutes: 60 | ||
|
@@ -119,7 +119,7 @@ jobs: | |
run: | | ||
cd /home/ci/build | ||
# revert hacked Gradle URL to the original one | ||
sed -i 's+file\\:/opt/gradle/gradle-7.6.3-bin.zip+https\\://services.gradle.org/distributions/gradle-7.6.3-bin.zip+g' OpenCV-android-sdk/samples/gradle/wrapper/gradle-wrapper.properties | ||
sed -i 's+file\\:/opt/gradle/gradle-8.11.1-bin.zip+https\\://services.gradle.org/distributions/gradle-8.11.1-bin.zip+g' OpenCV-android-sdk/samples/gradle/wrapper/gradle-wrapper.properties | ||
zip -r -9 -y OpenCV4Android.zip OpenCV-android-sdk | ||
zip -r -9 -y sdk-maven-repo.zip maven_repo | ||
cd /home/ci/build/outputs | ||
|