mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-04-19 19:15:26 +00:00
Add opencv to linux CI and specify which modules we want to use
This commit is contained in:
parent
b08273b127
commit
807c5e2240
4 changed files with 8 additions and 8 deletions
|
@ -56,7 +56,7 @@ env:
|
|||
|
||||
# linux_task:
|
||||
# container:
|
||||
# image: rpcs3/rpcs3-ci-jammy:1.0
|
||||
# image: rpcs3/rpcs3-ci-jammy:1.1
|
||||
# cpu: 4
|
||||
# memory: 16G
|
||||
# env:
|
||||
|
@ -132,7 +132,7 @@ linux_aarch64_task:
|
|||
matrix:
|
||||
- name: Cirrus Linux AArch64 Clang
|
||||
arm_container:
|
||||
image: 'docker.io/rpcs3/rpcs3-ci-jammy-aarch64:1.0'
|
||||
image: 'docker.io/rpcs3/rpcs3-ci-jammy-aarch64:1.1'
|
||||
cpu: 8
|
||||
memory: 8G
|
||||
clang_script:
|
||||
|
|
6
.github/workflows/rpcs3.yml
vendored
6
.github/workflows/rpcs3.yml
vendored
|
@ -29,15 +29,15 @@ jobs:
|
|||
matrix:
|
||||
include:
|
||||
- os: ubuntu-24.04
|
||||
docker_img: "rpcs3/rpcs3-ci-jammy:1.0"
|
||||
docker_img: "rpcs3/rpcs3-ci-jammy:1.1"
|
||||
build_sh: "/rpcs3/.ci/build-linux.sh"
|
||||
compiler: clang
|
||||
- os: ubuntu-24.04
|
||||
docker_img: "rpcs3/rpcs3-ci-jammy:1.0"
|
||||
docker_img: "rpcs3/rpcs3-ci-jammy:1.1"
|
||||
build_sh: "/rpcs3/.ci/build-linux.sh"
|
||||
compiler: gcc
|
||||
- os: ubuntu-24.04-arm
|
||||
docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.0"
|
||||
docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.1"
|
||||
build_sh: "/rpcs3/.ci/build-linux-aarch64.sh"
|
||||
compiler: clang
|
||||
runs-on: ${{ matrix.os }}
|
||||
|
|
2
3rdparty/opencv/CMakeLists.txt
vendored
2
3rdparty/opencv/CMakeLists.txt
vendored
|
@ -4,7 +4,7 @@ set(OPENCV_TARGET 3rdparty_dummy_lib PARENT_SCOPE)
|
|||
|
||||
if (USE_SYSTEM_OPENCV)
|
||||
message(STATUS "RPCS3: using system OpenCV")
|
||||
find_package(OpenCV)
|
||||
find_package(OpenCV COMPONENTS core photo)
|
||||
|
||||
if(OPENCV_FOUND)
|
||||
message(STATUS "RPCS3: found system OpenCV")
|
||||
|
|
|
@ -38,13 +38,13 @@ jobs:
|
|||
displayName: ccache
|
||||
|
||||
- bash: |
|
||||
docker pull --quiet rpcs3/rpcs3-ci-jammy:1.0
|
||||
docker pull --quiet rpcs3/rpcs3-ci-jammy:1.1
|
||||
docker run \
|
||||
-v $(pwd):/rpcs3 \
|
||||
--env-file .ci/docker.env \
|
||||
-v $CCACHE_DIR:/root/.ccache \
|
||||
-v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \
|
||||
rpcs3/rpcs3-ci-jammy:1.0 \
|
||||
rpcs3/rpcs3-ci-jammy:1.1 \
|
||||
/rpcs3/.ci/build-linux.sh
|
||||
displayName: Docker setup and build
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue