From 58714d8c6874ee87b0c0155d8ab1acc16d3ac0f9 Mon Sep 17 00:00:00 2001 From: Ani Date: Mon, 7 Apr 2025 12:38:53 +0200 Subject: [PATCH] docker: Update ffmpeg to 7.1.1 --- .cirrus.yml | 4 ++-- .github/workflows/rpcs3.yml | 6 +++--- azure-pipelines.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 3b71413102..6041cc8702 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -58,7 +58,7 @@ env: # linux_task: # container: -# image: rpcs3/rpcs3-ci-jammy:1.2 +# image: rpcs3/rpcs3-ci-jammy:1.5 # cpu: 4 # memory: 16G # env: @@ -134,7 +134,7 @@ freebsd_task: # matrix: # - name: Cirrus Linux AArch64 Clang # arm_container: -# image: 'docker.io/rpcs3/rpcs3-ci-jammy-aarch64:1.2' +# image: 'docker.io/rpcs3/rpcs3-ci-jammy-aarch64:1.5' # cpu: 8 # memory: 8G # clang_script: diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index d28c13f6e2..683712cf69 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -25,17 +25,17 @@ jobs: matrix: include: - os: ubuntu-24.04 - docker_img: "rpcs3/rpcs3-ci-jammy:1.4" + docker_img: "rpcs3/rpcs3-ci-jammy:1.5" build_sh: "/rpcs3/.ci/build-linux.sh" compiler: clang UPLOAD_COMMIT_HASH: d812f1254a1157c80fd402f94446310560f54e5f UPLOAD_REPO_FULL_NAME: "rpcs3/rpcs3-binaries-linux" - os: ubuntu-24.04 - docker_img: "rpcs3/rpcs3-ci-jammy:1.4" + docker_img: "rpcs3/rpcs3-ci-jammy:1.5" build_sh: "/rpcs3/.ci/build-linux.sh" compiler: gcc - os: ubuntu-24.04-arm - docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.4" + docker_img: "rpcs3/rpcs3-ci-jammy-aarch64:1.5" build_sh: "/rpcs3/.ci/build-linux-aarch64.sh" compiler: clang UPLOAD_COMMIT_HASH: a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8e2ef1d8fb..5e442bd01b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,13 +40,13 @@ jobs: # displayName: ccache # - bash: | -# docker pull --quiet rpcs3/rpcs3-ci-jammy:1.4 +# docker pull --quiet rpcs3/rpcs3-ci-jammy:1.5 # 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.4 \ +# rpcs3/rpcs3-ci-jammy:1.5 \ # /rpcs3/.ci/build-linux.sh # displayName: Docker setup and build