transifex: Update CMake to 3.22.6... (#37)

* transifex: Update CMake to 3.22.6; port https://github.com/yuzu-emu/build-environments/pull/67

curl

* mingw: fix ffmpeg link

* CI: build on all branches
This commit is contained in:
SachinVin 2023-02-18 14:31:06 +08:00 committed by GitHub
parent 1c7f3bbe1f
commit 5ac00a5145
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions

View File

@ -1,7 +1,7 @@
name: 'Citra Docker Image CI'
on:
push:
branches: ["master"]
branches: ["*"]
pull_request:
branches: ["master"]

View File

@ -4,9 +4,10 @@ pip3 install pefile
# ffmpeg
FFMPEG_VER='5.1.2'
FILENAME="ffmpeg-n${FFMPEG_VER}-9-g807afa59cc-win64-gpl-shared-${FFMPEG_VER%.*}"
LINK_PATH="autobuild-2023-01-28-12-37/ffmpeg-n5.1.2-11-g30d432f205-win64-gpl-shared-5.1"
FILENAME="${LINK_PATH##*/}"
echo "Downloading ffmpeg (${FFMPEG_VER})..."
wget -c "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2022-12-25-12-38/${FILENAME}.zip"
wget -c "https://github.com/BtbN/FFmpeg-Builds/releases/download/${LINK_PATH}.zip"
7z x "${FILENAME}.zip"
echo "Copying ffmpeg ${FFMPEG_VER} files to sysroot..."

View File

@ -1,6 +1,16 @@
FROM debian:bullseye-slim
LABEL maintainer="citraemu"
ENV DEBIAN_FRONTEND=noninteractive
ENV CMAKE_VER=3.22.6
RUN apt-get update && apt-get -y full-upgrade
RUN apt-get install -y git p7zip-full libqt5opengl5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools python3-pip cmake
RUN apt-get install -y git p7zip-full libqt5opengl5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools python3-pip cmake curl
RUN pip3 install transifex-client
# Install CMake from upstream
RUN cd /tmp
RUN curl -OL https://github.com/Kitware/CMake/releases/download/v${CMAKE_VER}/cmake-${CMAKE_VER}-linux-x86_64.tar.gz && \
tar xvf cmake-${CMAKE_VER}-linux-x86_64.tar.gz && \
cp -rv cmake-${CMAKE_VER}-linux-x86_64/* /usr && \
rm -rf cmake-*