Archive/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-28 13:28:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add opencv to linux CI and specify which modules we want to use

Browse source
This commit is contained in:
Zion Nimchuk 2025-02-23 21:29:21 -08:00 • committed by Megamouse
parent b08273b127
commit 807c5e2240
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.cirrus.yml
View file

@ -56,7 +56,7 @@ env:
# linux_task: # linux_task:
# container: # container:
# image: rpcs3/rpcs3-ci-jammy:1.0 # image: rpcs3/rpcs3-ci-jammy:1.1
# cpu: 4 # cpu: 4
# memory: 16G # memory: 16G
# env: # env:
@ -132,7 +132,7 @@ linux_aarch64_task:
matrix: matrix:
- name: Cirrus Linux AArch64 Clang - name: Cirrus Linux AArch64 Clang
arm_container: arm_container:
image: 'docker.io/rpcs3/rpcs3-ci-jammy-aarch64:1.0' image: 'docker.io/rpcs3/rpcs3-ci-jammy-aarch64:1.1'
cpu: 8 cpu: 8
memory: 8G memory: 8G
clang_script: clang_script:

6
.github/workflows/rpcs3.yml vendored
View file

@ -29,15 +29,15 @@ jobs:
matrix: matrix:
include: include:
- os: ubuntu-24.04 - 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" build_sh: "/rpcs3/.ci/build-linux.sh"
compiler: clang compiler: clang
- os: ubuntu-24.04 - 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" build_sh: "/rpcs3/.ci/build-linux.sh"
compiler: gcc compiler: gcc
- os: ubuntu-24.04-arm - 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" build_sh: "/rpcs3/.ci/build-linux-aarch64.sh"
compiler: clang compiler: clang
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}

2
3rdparty/opencv/CMakeLists.txt vendored
View file

@ -4,7 +4,7 @@ set(OPENCV_TARGET 3rdparty_dummy_lib PARENT_SCOPE)
if (USE_SYSTEM_OPENCV) if (USE_SYSTEM_OPENCV)
message(STATUS "RPCS3: using system OpenCV") message(STATUS "RPCS3: using system OpenCV")
find_package(OpenCV) find_package(OpenCV COMPONENTS core photo)
if(OPENCV_FOUND) if(OPENCV_FOUND)
message(STATUS "RPCS3: found system OpenCV") message(STATUS "RPCS3: found system OpenCV")

4
azure-pipelines.yml
View file

@ -38,13 +38,13 @@ jobs:
displayName: ccache displayName: ccache
- bash: | - bash: |
docker pull --quiet rpcs3/rpcs3-ci-jammy:1.0 docker pull --quiet rpcs3/rpcs3-ci-jammy:1.1
docker run \ docker run \
-v $(pwd):/rpcs3 \ -v $(pwd):/rpcs3 \
--env-file .ci/docker.env \ --env-file .ci/docker.env \
-v $CCACHE_DIR:/root/.ccache \ -v $CCACHE_DIR:/root/.ccache \
-v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \ -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \
rpcs3/rpcs3-ci-jammy:1.0 \ rpcs3/rpcs3-ci-jammy:1.1 \
/rpcs3/.ci/build-linux.sh /rpcs3/.ci/build-linux.sh
displayName: Docker setup and build displayName: Docker setup and build