Add additional distros

.github/workflows/pull-requests_build-check.yml

@@ -89,8 +89,9 @@ jobs:
     name: deb
     runs-on: ubuntu-20.04
     strategy:
+      fail-fast: false
       matrix:
-        distro: [ 2004, 2104, debian ]
+        distro: [ debian, Fedora_33, Fedora_35, Ubuntu_18_04, Ubuntu_20_04, Ubuntu_21_04, Ubuntu_21_10 ]
 
     steps:
       - name: Checkout
@@ -154,13 +155,9 @@ jobs:
           mkdir sunshine-windows-build && cd sunshine-windows-build
           set PATH=C:\msys64\mingw64\bin
           set BOOST_ROOT=C:\boost
-          dir C:\boost\boost
-          echo -----------
           set BOOST_INCLUDEDIR=C:\boost
           set BOOST_LIBRARYDIR=C:\boost\lib
-          dir C:\boost\boost\lib
+          cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" ..
-          echo -----------
-          cmake -DBoost_USE_STATIC_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" ..
           mingw32-make -j2
       - name: Package Windows
         run: |

appveyor.yml

@@ -4,9 +4,9 @@ services:
 environment:
   matrix:
     - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
-      DOCKERFILE: Dockerfile-2004
+      DOCKERFILE: Dockerfile-Ubuntu_20_04
     - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
-      DOCKERFILE: Dockerfile-2104
+      DOCKERFILE: Dockerfile-Ubuntu_21_04
     - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
       DOCKERFILE: Dockerfile-debian
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019

scripts/Dockerfile-Fedora_33

@@ -0,0 +1,13 @@
+FROM fedora:33 AS sunshine-fedora_33
+
+ARG DEBIAN_FRONTEND=noninteractive 
+ARG TZ="Europe/London"
+
+RUN dnf group install "Development Tools" \
+    dnf install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm \
+    dnf install -y openssl-devel ffmpeg-devel boost-devel boost-static.x86_64 pulseaudio-libs-devel opus-devel libXtst-devel libX11-devel libXfixes-devel libevdev-devel libxcb-devel cmake
+
+COPY build-private.sh /root/build.sh
+
+
+ENTRYPOINT ["/root/build.sh"]

scripts/Dockerfile-Fedora_35

@@ -0,0 +1,14 @@
+FROM fedora:33 AS sunshine-fedora_33
+
+ARG DEBIAN_FRONTEND=noninteractive 
+ARG TZ="Europe/London"
+
+RUN dnf group install "Development Tools" \
+    dnf install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm \
+    dnf install -y openssl-devel ffmpeg-devel boost-devel boost-static.x86_64 pulseaudio-libs-devel opus-devel libXtst-devel libX11-devel libXfixes-devel libevdev-devel libxcb-devel cmake \
+    dnf install libXcursor-devel libXrandr-devel libXinerama-devel libXi-devel mesa-libGL-devel
+
+COPY build-private.sh /root/build.sh
+
+
+ENTRYPOINT ["/root/build.sh"]

scripts/Dockerfile-Ubuntu_18_04

@@ -1,4 +1,4 @@
-FROM ubuntu:20.04 AS sunshine-2004
+FROM ubuntu:18.04 AS sunshine-ubuntu_18_04
 
 ARG DEBIAN_FRONTEND=noninteractive 
 ARG TZ="Europe/London"

scripts/Dockerfile-Ubuntu_20_04

@@ -0,0 +1,18 @@
+FROM ubuntu:20.04 AS sunshine-ubuntu_20_04
+
+ARG DEBIAN_FRONTEND=noninteractive 
+ARG TZ="Europe/London"
+
+RUN apt-get update -y && \
+    apt-get install -y \
+    git wget gcc-10 g++-10 build-essential cmake libssl-dev libavdevice-dev libboost-thread-dev libboost-filesystem-dev libboost-log-dev libpulse-dev libopus-dev libxtst-dev libx11-dev libxrandr-dev libxfixes-dev libevdev-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev libdrm-dev libcap-dev libwayland-dev
+
+RUN cp /usr/bin/gcc-10 /usr/bin/gcc && cp /usr/bin/g++-10 /usr/bin/gcc-10
+
+RUN wget https://developer.download.nvidia.com/compute/cuda/11.4.2/local_installers/cuda_11.4.2_470.57.02_linux.run --progress=bar:force:noscroll -q --show-progress -O /root/cuda.run && chmod a+x /root/cuda.run
+RUN /root/cuda.run --silent --toolkit --toolkitpath=/usr --no-opengl-libs --no-man-page --no-drm && rm /root/cuda.run
+
+COPY build-private.sh /root/build.sh
+
+
+ENTRYPOINT ["/root/build.sh"]

scripts/Dockerfile-Ubuntu_21_04

@@ -1,4 +1,4 @@
-FROM ubuntu:21.04 AS sunshine-2104
+FROM ubuntu:21.04 AS sunshine-ubuntu_21_04
 
 ARG DEBIAN_FRONTEND=noninteractive 
 ARG TZ="Europe/London"

scripts/Dockerfile-Ubuntu_21_10

@@ -0,0 +1,13 @@
+FROM ubuntu:21.10 AS sunshine-ubuntu_21_10
+
+ARG DEBIAN_FRONTEND=noninteractive 
+ARG TZ="Europe/London"
+
+RUN apt-get update -y && \
+    apt-get install -y \
+    git build-essential cmake libssl-dev libavdevice-dev libboost-thread-dev libboost-filesystem-dev libboost-log-dev libpulse-dev libopus-dev libxtst-dev libx11-dev libxrandr-dev libxfixes-dev libevdev-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev libdrm-dev libcap-dev libwayland-dev nvidia-cuda-dev nvidia-cuda-toolkit
+
+COPY build-private.sh /root/build.sh
+
+
+ENTRYPOINT ["/root/build.sh"]