Revert "Adds required Dockerfiles for Linux Arm64" (#58)
This commit is contained in:
parent
ec0efa8b1c
commit
cf30470748
6
.github/workflows/ci.yml
vendored
6
.github/workflows/ci.yml
vendored
@ -10,14 +10,10 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
image: ["linux-appimage", "linux-arm64-appimage", "linux-arm64-appimage-packaging", "linux-fresh"]
|
image: ["linux-appimage", "linux-fresh"]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Set up QEMU
|
|
||||||
uses: docker/setup-qemu-action@v2
|
|
||||||
with:
|
|
||||||
platforms: 'arm64'
|
|
||||||
- uses: docker/setup-buildx-action@v2
|
- uses: docker/setup-buildx-action@v2
|
||||||
name: Setup Docker BuildX system
|
name: Setup Docker BuildX system
|
||||||
- name: Login to DockerHub
|
- name: Login to DockerHub
|
||||||
|
@ -1,44 +0,0 @@
|
|||||||
FROM arm64v8/ubuntu:20.04
|
|
||||||
SHELL ["/bin/bash", "-c"]
|
|
||||||
LABEL maintainer="citraemu"
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN apt update
|
|
||||||
RUN apt-get install -y software-properties-common lsb-release curl
|
|
||||||
RUN apt-get update
|
|
||||||
RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test
|
|
||||||
RUN add-apt-repository -y ppa:okirby/qt6-backports
|
|
||||||
RUN add-apt-repository -y ppa:okirby/qt6-testing
|
|
||||||
RUN add-apt-repository -y ppa:theofficialgman/gpu-tools
|
|
||||||
RUN curl -s https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
|
|
||||||
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 42D5A192B819C5DA
|
|
||||||
RUN add-apt-repository -y 'deb https://apt.kitware.com/ubuntu/ focal main'
|
|
||||||
RUN apt-get update && apt-get upgrade -y && apt-get dist-upgrade -y
|
|
||||||
RUN apt-get install -y \
|
|
||||||
libsdl2-dev \
|
|
||||||
libssl-dev \
|
|
||||||
qt6-base-dev \
|
|
||||||
qt6-base-private-dev \
|
|
||||||
qt6-multimedia-dev \
|
|
||||||
qt6-l10n-tools \
|
|
||||||
qt6-tools-dev \
|
|
||||||
qt6-tools-dev-tools \
|
|
||||||
qt6-documentation-tools \
|
|
||||||
ffmpeg \
|
|
||||||
libavcodec-dev \
|
|
||||||
libavdevice-dev \
|
|
||||||
libavfilter-dev \
|
|
||||||
libavformat-dev \
|
|
||||||
libswresample-dev \
|
|
||||||
libswscale-dev \
|
|
||||||
p7zip-full \
|
|
||||||
wget \
|
|
||||||
unzip \
|
|
||||||
git \
|
|
||||||
ccache \
|
|
||||||
glslang-dev \
|
|
||||||
glslang-tools \
|
|
||||||
patchelf \
|
|
||||||
desktop-file-utils \
|
|
||||||
file
|
|
@ -1,65 +0,0 @@
|
|||||||
FROM ubuntu:20.04
|
|
||||||
SHELL ["/bin/bash", "-c"]
|
|
||||||
LABEL maintainer="citraemu"
|
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
# Create a user account citra (UID 1027) that the container will run as
|
|
||||||
RUN useradd -m -u 1027 -s /bin/bash citra
|
|
||||||
|
|
||||||
# Update system, install PPAs and install packages for building Citra.
|
|
||||||
RUN apt-get update && apt-get full-upgrade -y
|
|
||||||
RUN apt-get install -y software-properties-common lsb-release curl
|
|
||||||
RUN apt-get update
|
|
||||||
RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test
|
|
||||||
RUN add-apt-repository -y ppa:okirby/qt6-backports
|
|
||||||
RUN add-apt-repository -y ppa:okirby/qt6-testing
|
|
||||||
RUN add-apt-repository -y ppa:theofficialgman/gpu-tools
|
|
||||||
RUN curl -s https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
|
|
||||||
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 42D5A192B819C5DA
|
|
||||||
RUN add-apt-repository -y 'deb https://apt.kitware.com/ubuntu/ focal main'
|
|
||||||
RUN apt-get update && apt-get upgrade -y && apt-get dist-upgrade -y
|
|
||||||
|
|
||||||
# Add arm64 architecture
|
|
||||||
RUN dpkg --add-architecture arm64
|
|
||||||
RUN sh -c "sed \"s|^deb \([a-z\.:/]*\) \([a-z\-]*\) \(.*\)$|deb [arch=amd64] \1 \2 \3\ndeb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports \2 \3|\" /etc/apt/sources.list > /etc/apt/sources.list.new"
|
|
||||||
RUN rm /etc/apt/sources.list
|
|
||||||
RUN mv /etc/apt/sources.list.new /etc/apt/sources.list
|
|
||||||
RUN apt-get update
|
|
||||||
RUN apt-get install -y \
|
|
||||||
build-essential \
|
|
||||||
libsdl2-dev:arm64 \
|
|
||||||
libssl-dev:arm64 \
|
|
||||||
# Qt 6
|
|
||||||
qt6-base-dev:arm64 \
|
|
||||||
qt6-base-private-dev:arm64 \
|
|
||||||
qt6-multimedia-dev:arm64 \
|
|
||||||
qt6-l10n-tools \
|
|
||||||
qt6-tools-dev:arm64 \
|
|
||||||
qt6-tools-dev-tools:arm64 \
|
|
||||||
qt6-documentation-tools:arm64 \
|
|
||||||
# FFmpeg
|
|
||||||
ffmpeg:arm64 \
|
|
||||||
libavcodec-dev:arm64 \
|
|
||||||
libavdevice-dev:arm64 \
|
|
||||||
libavfilter-dev:arm64 \
|
|
||||||
libavformat-dev:arm64 \
|
|
||||||
libswresample-dev:arm64 \
|
|
||||||
libswscale-dev:arm64 \
|
|
||||||
# Tools
|
|
||||||
cmake \
|
|
||||||
p7zip-full \
|
|
||||||
wget \
|
|
||||||
unzip \
|
|
||||||
git \
|
|
||||||
ccache \
|
|
||||||
ninja-build \
|
|
||||||
glslang-dev \
|
|
||||||
glslang-tools \
|
|
||||||
patchelf \
|
|
||||||
file \
|
|
||||||
zstd
|
|
||||||
|
|
||||||
# Install GCC 11
|
|
||||||
RUN wget https://github.com/xieyubo/gcc-build/releases/download/gcc-11.2.0-1/gcc-11.2.0-1-ubuntu-20.04.deb
|
|
||||||
RUN apt install -y ./gcc-11.2.0-1-ubuntu-20.04.deb
|
|
Loading…
x
Reference in New Issue
Block a user