From 1b0978f252fdf6056ea32f8d54e450d3cbde7d64 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Fri, 17 Dec 2021 10:55:18 -0500 Subject: [PATCH 001/106] Create sunshine.png --- sunshine.png | Bin 0 -> 14699 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 sunshine.png diff --git a/sunshine.png b/sunshine.png new file mode 100644 index 0000000000000000000000000000000000000000..77f4795673e5bc0e5c828e4b37f26a6d8c05105d GIT binary patch literal 14699 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 tMkvIoS9c?+KHU?(UL Date: Fri, 17 Dec 2021 10:55:20 -0500 Subject: [PATCH 002/106] Create sunshine.desktop --- sunshine.desktop | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 sunshine.desktop diff --git a/sunshine.desktop b/sunshine.desktop new file mode 100644 index 00000000000..591af9d4ffc --- /dev/null +++ b/sunshine.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Application +Name=sunshine +Exec=sunshine +Version=1.0 +Comment=Host for Moonlight Streaming Client +Icon=sunshine +Categories=Utility; +Terminal=true +X-AppImage-Name=sunshine +X-AppImage-Version=1.0 +X-AppImage-Arch=x86_64 From 8478ccca5daa4103ba9ffa14090f35d8a1fc4b34 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Fri, 17 Dec 2021 10:55:23 -0500 Subject: [PATCH 003/106] Create pull-requests_build-check.yml --- .../workflows/pull-requests_build-check.yml | 91 +++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 .github/workflows/pull-requests_build-check.yml diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml new file mode 100644 index 00000000000..c6dc90ec5ff --- /dev/null +++ b/.github/workflows/pull-requests_build-check.yml @@ -0,0 +1,91 @@ +name: Build test + +on: + pull_request: + types: [opened, synchronize, edited, reopened] + workflow_dispatch: + +jobs: +# check_branch: +# runs-on: ubuntu-latest +# +# steps: +# - name: Fail Workflow +# if: github.base_ref != 'nightly' +# run: | +# echo Base: "$GITHUB_BASE_REF" +# echo Head: "$GITHUB_HEAD_REF" +# exit 1 + + build_linux: + name: Linux + runs-on: ubuntu-20.04 +# needs: check_branch + + steps: + - uses: actions/checkout@v2 + - name: Setup Dependencies + run: | + mkdir -p artifacts + + sudo apt-get update -y && \ + sudo apt-get --reinstall 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 + sudo cp /usr/bin/gcc-10 /usr/bin/gcc && sudo cp /usr/bin/g++-10 /usr/bin/gcc-10 + sudo 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 && sudo chmod a+x /root/cuda.run + sudo /root/cuda.run --silent --toolkit --toolkitpath=/usr --no-opengl-libs --no-man-page --no-drm && sudo rm /root/cuda.run + sudo add-apt-repository ppa:savoury1/graphics -y + sudo add-apt-repository ppa:savoury1/multimedia -y + sudo add-apt-repository ppa:savoury1/ffmpeg4 -y + sudo apt-get update -y + sudo apt-get upgrade -y && sudo apt-get dist-upgrade -y + sudo apt-get install ffmpeg -y + - name: Build Sunshine for AppImage + run: | + CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Release}" + SUNSHINE_EXECUTABLE_PATH="${SUNSHINE_EXECUTABLE_PATH:-/usr/bin/sunshine}" + SUNSHINE_ASSETS_DIR="${SUNSHINE_ASSETS_DIR:-sunshine.AppImage.config}" + + SUNSHINE_ENABLE_WAYLAND=${SUNSHINE_ENABLE_WAYLAND:-ON} + SUNSHINE_ENABLE_X11=${SUNSHINE_ENABLE_X11:-ON} + SUNSHINE_ENABLE_DRM=${SUNSHINE_ENABLE_DRM:-ON} + SUNSHINE_ENABLE_CUDA=${SUNSHINE_ENABLE_CUDA:-ON} + + mkdir -p appimage-build && cd appimage-build + + cmake "-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE" "-DSUNSHINE_EXECUTABLE_PATH=$SUNSHINE_EXECUTABLE_PATH" "-DSUNSHINE_ASSETS_DIR=$SUNSHINE_ASSETS_DIR" "-DSUNSHINE_ENABLE_WAYLAND=$SUNSHINE_ENABLE_WAYLAND" "-DSUNSHINE_ENABLE_X11=$SUNSHINE_ENABLE_X11" "-DSUNSHINE_ENABLE_DRM=$SUNSHINE_ENABLE_DRM" "-DSUNSHINE_ENABLE_CUDA=$SUNSHINE_ENABLE_CUDA" ".." -DCMAKE_INSTALL_PREFIX=/usr + + make -j ${nproc} DESTDIR=AppDir + - name: Build AppImage + # https://docs.appimage.org/packaging-guide/index.html + run: | + DESKTOP_FILE="${DESKTOP_FILE:-sunshine.desktop}" + ICON_FILE="${ICON_FILE:-sunshine.png}" + CONFIG_DIR="${CONFIG_DIR:-sunshine/sunshine.AppImage.config/}" + HOME_DIR="${HOME_DIR:-sunshine/sunshine.AppImage.home/}" + + mkdir -p temp_appimage && cd temp_appimage + + wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage && chmod +x linuxdeploy-x86_64.AppImage + ./linuxdeploy-x86_64.AppImage --appdir AppDir -e ../appimage-build/sunshine -i "../$ICON_FILE" -d "../$DESKTOP_FILE" --output appimage + + mv sunshine*.AppImage sunshine.AppImage + mkdir sunshine && mv sunshine.AppImage sunshine/ + ./sunshine/sunshine.AppImage --appimage-portable-config + ./sunshine/sunshine.AppImage --appimage-portable-home + cp -r ../assets/* "$CONFIG_DIR" + rm -f "$CONFIG_DIR"/apps_windows.json + mkdir -p ./$HOME_DIR/.config/$CONFIG_DIR + cp ./$CONFIG_DIR/apps_linux.json ./$HOME_DIR/.config/$CONFIG_DIR + zip -r ./sunshine_linux.zip ./sunshine/* + + cd .. + mv ./temp_appimage/sunshine_linux.zip ./artifacts/sunshine_linux.zip + - name: Verify AppImage + run: | + wget https://github.com/TheAssassin/appimagelint/releases/download/continuous/appimagelint-x86_64.AppImage && chmod +x appimagelint-x86_64.AppImage && ./appimagelint-x86_64.AppImage .temp_appimage/sunshine/sunshine.AppImage + - name: Upload Artifacts + - uses: actions/upload-artifact@v2 + with: + name: Artifacts + path: artifacts/ From c5b8deff41a6c0dafa36cb001a6a758a6f2de187 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Fri, 17 Dec 2021 10:59:55 -0500 Subject: [PATCH 004/106] Update pull-requests_build-check.yml -Fix syntax error --- .github/workflows/pull-requests_build-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index c6dc90ec5ff..e7471a7ca80 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -85,7 +85,7 @@ jobs: run: | wget https://github.com/TheAssassin/appimagelint/releases/download/continuous/appimagelint-x86_64.AppImage && chmod +x appimagelint-x86_64.AppImage && ./appimagelint-x86_64.AppImage .temp_appimage/sunshine/sunshine.AppImage - name: Upload Artifacts - - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v2 with: name: Artifacts path: artifacts/ From e2d3fef9db2a788a0a363067ad191c663f1b5af6 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Fri, 17 Dec 2021 13:30:19 -0500 Subject: [PATCH 005/106] Update pull-requests_build-check.yml -Attempt to fix build step at line 56 -Various tweaks to quoting and directory names --- .../workflows/pull-requests_build-check.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index e7471a7ca80..ac7bf50b02e 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -53,21 +53,22 @@ jobs: mkdir -p appimage-build && cd appimage-build - cmake "-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE" "-DSUNSHINE_EXECUTABLE_PATH=$SUNSHINE_EXECUTABLE_PATH" "-DSUNSHINE_ASSETS_DIR=$SUNSHINE_ASSETS_DIR" "-DSUNSHINE_ENABLE_WAYLAND=$SUNSHINE_ENABLE_WAYLAND" "-DSUNSHINE_ENABLE_X11=$SUNSHINE_ENABLE_X11" "-DSUNSHINE_ENABLE_DRM=$SUNSHINE_ENABLE_DRM" "-DSUNSHINE_ENABLE_CUDA=$SUNSHINE_ENABLE_CUDA" ".." -DCMAKE_INSTALL_PREFIX=/usr + cmake "-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE" "-DSUNSHINE_EXECUTABLE_PATH=$SUNSHINE_EXECUTABLE_PATH" "-DSUNSHINE_ASSETS_DIR=$SUNSHINE_ASSETS_DIR" "-DSUNSHINE_ENABLE_WAYLAND=$SUNSHINE_ENABLE_WAYLAND" "-DSUNSHINE_ENABLE_X11=$SUNSHINE_ENABLE_X11" "-DSUNSHINE_ENABLE_DRM=$SUNSHINE_ENABLE_DRM" "-DSUNSHINE_ENABLE_CUDA=$SUNSHINE_ENABLE_CUDA" "../" -DCMAKE_INSTALL_PREFIX=/usr make -j ${nproc} DESTDIR=AppDir - name: Build AppImage # https://docs.appimage.org/packaging-guide/index.html run: | + mkdir -p appimage_temp && cd appimage_temp + DESKTOP_FILE="${DESKTOP_FILE:-sunshine.desktop}" ICON_FILE="${ICON_FILE:-sunshine.png}" CONFIG_DIR="${CONFIG_DIR:-sunshine/sunshine.AppImage.config/}" HOME_DIR="${HOME_DIR:-sunshine/sunshine.AppImage.home/}" - mkdir -p temp_appimage && cd temp_appimage - wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage && chmod +x linuxdeploy-x86_64.AppImage - ./linuxdeploy-x86_64.AppImage --appdir AppDir -e ../appimage-build/sunshine -i "../$ICON_FILE" -d "../$DESKTOP_FILE" --output appimage + + ./linuxdeploy-x86_64.AppImage --appdir ../AppDir -e ../appimage-build/sunshine -i "../$ICON_FILE" -d "../$DESKTOP_FILE" --output appimage mv sunshine*.AppImage sunshine.AppImage mkdir sunshine && mv sunshine.AppImage sunshine/ @@ -75,15 +76,15 @@ jobs: ./sunshine/sunshine.AppImage --appimage-portable-home cp -r ../assets/* "$CONFIG_DIR" rm -f "$CONFIG_DIR"/apps_windows.json - mkdir -p ./$HOME_DIR/.config/$CONFIG_DIR - cp ./$CONFIG_DIR/apps_linux.json ./$HOME_DIR/.config/$CONFIG_DIR + mkdir -p ./"$HOME_DIR"/.config/"$CONFIG_DIR" + cp ./"$CONFIG_DIR"/apps_linux.json ./"$HOME_DIR"/.config/"$CONFIG_DIR" zip -r ./sunshine_linux.zip ./sunshine/* - cd .. - mv ./temp_appimage/sunshine_linux.zip ./artifacts/sunshine_linux.zip + mv sunshine_linux.zip ../artifacts/ - name: Verify AppImage run: | - wget https://github.com/TheAssassin/appimagelint/releases/download/continuous/appimagelint-x86_64.AppImage && chmod +x appimagelint-x86_64.AppImage && ./appimagelint-x86_64.AppImage .temp_appimage/sunshine/sunshine.AppImage + cd appimage_temp + wget https://github.com/TheAssassin/appimagelint/releases/download/continuous/appimagelint-x86_64.AppImage && chmod +x appimagelint-x86_64.AppImage && ./appimagelint-x86_64.AppImage ./sunshine/sunshine.AppImage - name: Upload Artifacts uses: actions/upload-artifact@v2 with: From 89cfbc6bd3c7a53c5513814f370f243eaa2b394f Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Fri, 17 Dec 2021 14:15:23 -0500 Subject: [PATCH 006/106] Update pull-requests_build-check.yml -Checkout recursively with submodules --- .github/workflows/pull-requests_build-check.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index ac7bf50b02e..b94c77406a9 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -23,7 +23,11 @@ jobs: # needs: check_branch steps: - - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: true + - name: Setup Dependencies run: | mkdir -p artifacts @@ -40,7 +44,7 @@ jobs: sudo apt-get update -y sudo apt-get upgrade -y && sudo apt-get dist-upgrade -y sudo apt-get install ffmpeg -y - - name: Build Sunshine for AppImage + - name: Build AppImage run: | CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Release}" SUNSHINE_EXECUTABLE_PATH="${SUNSHINE_EXECUTABLE_PATH:-/usr/bin/sunshine}" @@ -56,7 +60,7 @@ jobs: cmake "-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE" "-DSUNSHINE_EXECUTABLE_PATH=$SUNSHINE_EXECUTABLE_PATH" "-DSUNSHINE_ASSETS_DIR=$SUNSHINE_ASSETS_DIR" "-DSUNSHINE_ENABLE_WAYLAND=$SUNSHINE_ENABLE_WAYLAND" "-DSUNSHINE_ENABLE_X11=$SUNSHINE_ENABLE_X11" "-DSUNSHINE_ENABLE_DRM=$SUNSHINE_ENABLE_DRM" "-DSUNSHINE_ENABLE_CUDA=$SUNSHINE_ENABLE_CUDA" "../" -DCMAKE_INSTALL_PREFIX=/usr make -j ${nproc} DESTDIR=AppDir - - name: Build AppImage + - name: Package AppImage # https://docs.appimage.org/packaging-guide/index.html run: | mkdir -p appimage_temp && cd appimage_temp From f272b865cd5e796811cffedb5071a52b57b8e811 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Fri, 17 Dec 2021 17:36:11 -0500 Subject: [PATCH 007/106] Update pull-requests_build-check.yml -recursive submodules -only run on PR for master or nightly branch --- .github/workflows/pull-requests_build-check.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index b94c77406a9..90326429eb5 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -2,6 +2,7 @@ name: Build test on: pull_request: + branches: [master, nightly] types: [opened, synchronize, edited, reopened] workflow_dispatch: @@ -26,7 +27,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 with: - submodules: true + submodules: recursive - name: Setup Dependencies run: | From 502bf8ebf879b40bb81ebcaae7ae68ae195b8862 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Fri, 17 Dec 2021 22:00:37 -0500 Subject: [PATCH 008/106] Update pull-requests_build-check.yml -Add deb job with matrix strategy --- .../workflows/pull-requests_build-check.yml | 53 +++++++++++++------ 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 90326429eb5..5f842283d64 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -7,21 +7,9 @@ on: workflow_dispatch: jobs: -# check_branch: -# runs-on: ubuntu-latest -# -# steps: -# - name: Fail Workflow -# if: github.base_ref != 'nightly' -# run: | -# echo Base: "$GITHUB_BASE_REF" -# echo Head: "$GITHUB_HEAD_REF" -# exit 1 - - build_linux: - name: Linux + build_appimage: + name: AppImage runs-on: ubuntu-20.04 -# needs: check_branch steps: - name: Checkout @@ -29,7 +17,7 @@ jobs: with: submodules: recursive - - name: Setup Dependencies + - name: Setup Dependencies AppImage run: | mkdir -p artifacts @@ -93,5 +81,38 @@ jobs: - name: Upload Artifacts uses: actions/upload-artifact@v2 with: - name: Artifacts + name: sunshine-AppImage path: artifacts/ + + build_deb: + name: deb + runs-on: ubuntu-20.04 + strategy: + matrix: + distro: [ 2004, 2104, debian ] + + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: recursive + + - name: Setup Docker + run: | + mkdir -p artifacts + + cd scripts + ./build-container.sh -f Dockerfile-${{ matrix.distro }} + - name: Build and Package deb + run: | + cd scripts + ./build-sunshine -p -s .. + + cd sunshine-build + mv sunshine.deb sunshine-${{ matrix.distro }}.deb + mv sunshine-${{ matrix.distro }}.deb ../artifacts/ + - name: Upload Artifacts + uses: actions/upload-artifact@v2 + with: + name: sunshine-${{ matrix.distro }} + path: artifacts/ From 47a7c5e27b90118557750dc1876507fb6266e76f Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Fri, 17 Dec 2021 22:25:22 -0500 Subject: [PATCH 009/106] Fix typo in docker build readme --- .github/workflows/pull-requests_build-check.yml | 2 +- scripts/README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 5f842283d64..a13c6ff5b8c 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -106,7 +106,7 @@ jobs: - name: Build and Package deb run: | cd scripts - ./build-sunshine -p -s .. + ./build-sunshine.sh -p -s .. cd sunshine-build mv sunshine.deb sunshine-${{ matrix.distro }}.deb diff --git a/scripts/README.md b/scripts/README.md index 5c2068d476b..16e99ac80e6 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -32,13 +32,13 @@ cd scripts Then, the sources will be compiled and the debian package generated: ``` -./build-sunshine -p -s .. +./build-sunshine.sh -p -s .. ``` You can run `build-sunshine -p -s ..` again as long as the docker container exists. ``` git pull -./build-sunshine -p -s .. +./build-sunshine.sh -p -s .. ``` Optionally, the docker container can be removed after you're finished: From 69642d2db387a6833494688daa1cce9edb0d8cbb Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 18 Dec 2021 11:03:56 -0500 Subject: [PATCH 010/106] Update pull-requests_build-check.yml --- .../workflows/pull-requests_build-check.yml | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index a13c6ff5b8c..4c340d26057 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -79,6 +79,7 @@ jobs: cd appimage_temp wget https://github.com/TheAssassin/appimagelint/releases/download/continuous/appimagelint-x86_64.AppImage && chmod +x appimagelint-x86_64.AppImage && ./appimagelint-x86_64.AppImage ./sunshine/sunshine.AppImage - name: Upload Artifacts + if: ${{ github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }} uses: actions/upload-artifact@v2 with: name: sunshine-AppImage @@ -97,21 +98,28 @@ jobs: with: submodules: recursive - - name: Setup Docker + - name: Build run: | mkdir -p artifacts cd scripts - ./build-container.sh -f Dockerfile-${{ matrix.distro }} - - name: Build and Package deb - run: | - cd scripts - ./build-sunshine.sh -p -s .. + sudo ./build-container.sh -f Dockerfile-${{ matrix.distro }} -n sunshine-${{ matrix.distro }} + + ls cd sunshine-build mv sunshine.deb sunshine-${{ matrix.distro }}.deb mv sunshine-${{ matrix.distro }}.deb ../artifacts/ +# - name: Build and Package deb +# run: | +# cd scripts +# sudo ./build-sunshine.sh -p -n sunshine-${{ matrix.distro }} -s .. +# +# cd sunshine-build +# mv sunshine.deb sunshine-${{ matrix.distro }}.deb +# mv sunshine-${{ matrix.distro }}.deb ../artifacts/ - name: Upload Artifacts + if: ${{ github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }} uses: actions/upload-artifact@v2 with: name: sunshine-${{ matrix.distro }} From 23f9474e9e766f813bd04a7ff863d63eb0c7dead Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 18 Dec 2021 11:34:49 -0500 Subject: [PATCH 011/106] Update pull-requests_build-check.yml --- .github/workflows/pull-requests_build-check.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 4c340d26057..869be41cb44 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -103,11 +103,13 @@ jobs: mkdir -p artifacts cd scripts - sudo ./build-container.sh -f Dockerfile-${{ matrix.distro }} -n sunshine-${{ matrix.distro }} + sudo ./build-container.sh -c compile -f Dockerfile-${{ matrix.distro }} -n sunshine-${{ matrix.distro }} ls + echo "...." + ls .. - cd sunshine-build + cd sunshine-${{ matrix.distro }}-build mv sunshine.deb sunshine-${{ matrix.distro }}.deb mv sunshine-${{ matrix.distro }}.deb ../artifacts/ # - name: Build and Package deb From bbdf9618ea0c1dea5e1691af450e842bc32edc93 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 18 Dec 2021 11:41:06 -0500 Subject: [PATCH 012/106] Update pull-requests_build-check.yml --- .github/workflows/pull-requests_build-check.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 869be41cb44..85148cd6cd7 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -103,6 +103,7 @@ jobs: mkdir -p artifacts cd scripts + sudo ./build-container.sh -c build -f Dockerfile-${{ matrix.distro }} -n sunshine-${{ matrix.distro }} sudo ./build-container.sh -c compile -f Dockerfile-${{ matrix.distro }} -n sunshine-${{ matrix.distro }} ls From ca8917dd1b59f9742df88b89af2082ccbfc127a8 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 18 Dec 2021 16:31:45 -0500 Subject: [PATCH 013/106] Update pull-requests_build-check.yml -build with -u for non interactive --- .github/workflows/pull-requests_build-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 85148cd6cd7..7a586a1059e 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -104,7 +104,7 @@ jobs: cd scripts sudo ./build-container.sh -c build -f Dockerfile-${{ matrix.distro }} -n sunshine-${{ matrix.distro }} - sudo ./build-container.sh -c compile -f Dockerfile-${{ matrix.distro }} -n sunshine-${{ matrix.distro }} + sudo ./build-sunshine.sh -p -u -n sunshine-${{ matrix.distro }} -s .. ls echo "...." From 65b9b653d057b19d5eab6c5a48419e3fa82df702 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 18 Dec 2021 16:51:49 -0500 Subject: [PATCH 014/106] Update pull-requests_build-check.yml -Fix command that moves deb package -Separate setup, build, and package steps --- .../workflows/pull-requests_build-check.yml | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 7a586a1059e..159e2655f31 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -98,29 +98,20 @@ jobs: with: submodules: recursive - - name: Build + - name: Setup Container deb run: | mkdir -p artifacts cd scripts sudo ./build-container.sh -c build -f Dockerfile-${{ matrix.distro }} -n sunshine-${{ matrix.distro }} + - name: Build deb + run: | + cd scripts sudo ./build-sunshine.sh -p -u -n sunshine-${{ matrix.distro }} -s .. - - ls - echo "...." - ls .. - - cd sunshine-${{ matrix.distro }}-build - mv sunshine.deb sunshine-${{ matrix.distro }}.deb - mv sunshine-${{ matrix.distro }}.deb ../artifacts/ -# - name: Build and Package deb -# run: | -# cd scripts -# sudo ./build-sunshine.sh -p -n sunshine-${{ matrix.distro }} -s .. -# -# cd sunshine-build -# mv sunshine.deb sunshine-${{ matrix.distro }}.deb -# mv sunshine-${{ matrix.distro }}.deb ../artifacts/ + - name: Package deb + run: | + cd scripts + mv ./sunshine-${{ matrix.distro }}-build/sunshine-${{ matrix.distro }}.deb ../artifacts/ - name: Upload Artifacts if: ${{ github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }} uses: actions/upload-artifact@v2 From b73ddc232b563aa5e2086d60f16bdc3329e0944d Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 18 Dec 2021 17:01:54 -0500 Subject: [PATCH 015/106] Update pull-requests_build-check.yml -Fix permission denied error when moving deb package --- .github/workflows/pull-requests_build-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 159e2655f31..6cc6d9cba35 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -111,7 +111,7 @@ jobs: - name: Package deb run: | cd scripts - mv ./sunshine-${{ matrix.distro }}-build/sunshine-${{ matrix.distro }}.deb ../artifacts/ + sudo mv ./sunshine-${{ matrix.distro }}-build/sunshine-${{ matrix.distro }}.deb ../artifacts/ - name: Upload Artifacts if: ${{ github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }} uses: actions/upload-artifact@v2 From 256188618985214418cb7fc7f6d16075ee886bb7 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 18 Dec 2021 17:36:39 -0500 Subject: [PATCH 016/106] Update pull-requests_build-check.yml -Add Windows build --- .../workflows/pull-requests_build-check.yml | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 6cc6d9cba35..f3c92ded4f1 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -118,3 +118,40 @@ jobs: with: name: sunshine-${{ matrix.distro }} path: artifacts/ + + build_win: + name: Windows + runs-on: windows-2019 + + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + submodules: recursive + + - name: Setup Windows + run: | + pacman --needed --noconfirm -S mingw-w64-x86_64-binutils mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git yasm nasm diffutils make + - name: Build Windows + run: | + mkdir sunshine-windows-build && cd sunshine-windows-build + set PATH=C:\msys64\mingw64\bin + cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. + mingw32-make -j2 + - name: Package Windows + run: | + cd sunshine-windows-build + Del ..\assets\apps_linux.json + 7z a Sunshine-Windows.zip ..\assets + 7z a Sunshine-Windows.zip sunshine.exe + 7z a Sunshine-Windows.zip tools\dxgi-info.exe + 7z a Sunshine-Windows.zip tools\audio-info.exe + 7z a Sunshine-Windows.zip tools\sunshinesvc.exe + 7z a Sunshine-Windows.zip ..\tools\install-service.bat + 7z a Sunshine-Windows.zip ..\tools\uninstall-service.bat + - name: Upload Artifacts + if: ${{ github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }} + uses: actions/upload-artifact@v2 + with: + name: Windows + path: sunshine-windows-build/Sunshine-Windows.zip From 0fa68397b76fc50f23d9a18f43b2dde556eea133 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 18 Dec 2021 17:39:49 -0500 Subject: [PATCH 017/106] Update pull-requests_build-check.yml -Fix path issue for pacman command --- .github/workflows/pull-requests_build-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index f3c92ded4f1..3666ddcc6f6 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -131,7 +131,7 @@ jobs: - name: Setup Windows run: | - pacman --needed --noconfirm -S mingw-w64-x86_64-binutils mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git yasm nasm diffutils make + C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-binutils mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git yasm nasm diffutils make" - name: Build Windows run: | mkdir sunshine-windows-build && cd sunshine-windows-build From 71b54955699f7eff96a1adc379320d4037e762bd Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 18 Dec 2021 17:59:30 -0500 Subject: [PATCH 018/106] Update pull-requests_build-check.yml -Boost debug on --- .github/workflows/pull-requests_build-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 3666ddcc6f6..fbc5e91413a 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -136,7 +136,7 @@ jobs: run: | mkdir sunshine-windows-build && cd sunshine-windows-build set PATH=C:\msys64\mingw64\bin - cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. + cmake -DBoost_DEBUG=ON -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. mingw32-make -j2 - name: Package Windows run: | From f6d9061441b8173071729125e485cb4e21f45b89 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 18 Dec 2021 18:16:27 -0500 Subject: [PATCH 019/106] Update pull-requests_build-check.yml -Install boost -Remove boost debug during cmake --- .github/workflows/pull-requests_build-check.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index fbc5e91413a..77d563456b8 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -129,6 +129,21 @@ jobs: with: submodules: recursive + - name: Install boost + uses: MarkusJx/install-boost@v2.0.0 + id: install-boost + with: + # REQUIRED: Specify the required boost version + # A list of supported versions can be found here: + # https://github.com/actions/boost-versions/blob/main/versions-manifest.json + boost_version: 1.73.0 + # OPTIONAL: Specify a custom installation location + boost_install_dir: C:\boost + # OPTIONAL: Specify a platform version + platform_version: 2016 + + # NOTE: If a boost version matching all requirements cannot be found, + # this build step will fail - name: Setup Windows run: | C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-binutils mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git yasm nasm diffutils make" @@ -136,7 +151,7 @@ jobs: run: | mkdir sunshine-windows-build && cd sunshine-windows-build set PATH=C:\msys64\mingw64\bin - cmake -DBoost_DEBUG=ON -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. + cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. mingw32-make -j2 - name: Package Windows run: | From 2b0e1fb9dcfc6e50bb92780c595258398d791c7c Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 18 Dec 2021 18:21:12 -0500 Subject: [PATCH 020/106] Update pull-requests_build-check.yml -Fix boost install directory --- .github/workflows/pull-requests_build-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 77d563456b8..4a2335dc016 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -138,7 +138,7 @@ jobs: # https://github.com/actions/boost-versions/blob/main/versions-manifest.json boost_version: 1.73.0 # OPTIONAL: Specify a custom installation location - boost_install_dir: C:\boost + boost_install_dir: 'C:' # OPTIONAL: Specify a platform version platform_version: 2016 From de8cff072d5e59da8773a8da27e11492201aca12 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 18 Dec 2021 18:41:58 -0500 Subject: [PATCH 021/106] Update pull-requests_build-check.yml -Add environment variable BOOST_ROOT --- .github/workflows/pull-requests_build-check.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 4a2335dc016..69209a5eef4 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -148,6 +148,8 @@ jobs: run: | C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-binutils mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git yasm nasm diffutils make" - name: Build Windows + env: + BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} run: | mkdir sunshine-windows-build && cd sunshine-windows-build set PATH=C:\msys64\mingw64\bin From c49cbd3c3caeefccc87b8058c240da021d5e38dd Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 18 Dec 2021 19:15:05 -0500 Subject: [PATCH 022/106] Update pull-requests_build-check.yml --- .github/workflows/pull-requests_build-check.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 69209a5eef4..0d8424cfb2f 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -136,11 +136,11 @@ jobs: # REQUIRED: Specify the required boost version # A list of supported versions can be found here: # https://github.com/actions/boost-versions/blob/main/versions-manifest.json - boost_version: 1.73.0 + boost_version: 1.77.0 # OPTIONAL: Specify a custom installation location - boost_install_dir: 'C:' + # boost_install_dir: 'C:' # OPTIONAL: Specify a platform version - platform_version: 2016 + platform_version: 2019 # NOTE: If a boost version matching all requirements cannot be found, # this build step will fail @@ -153,7 +153,7 @@ jobs: run: | mkdir sunshine-windows-build && cd sunshine-windows-build set PATH=C:\msys64\mingw64\bin - cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. + cmake -DBOOST_ROOT=${{ steps.install-boost.outputs.BOOST_ROOT }} -DBOOST_INCLUDEDIR=${{ steps.install-boost.outputs.BOOST_ROOT }}/include -DBOOST_LIBRARYDIR=${{ steps.install-boost.outputs.BOOST_ROOT }}/lib -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. mingw32-make -j2 - name: Package Windows run: | From 214478760b647f5e7c1c6992fe996bb38faa5f41 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 18 Dec 2021 19:37:32 -0500 Subject: [PATCH 023/106] Update pull-requests_build-check.yml -Try older version of boost, new version failing with cmake 3.22 --- .github/workflows/pull-requests_build-check.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 0d8424cfb2f..a4d8a28340f 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -130,17 +130,17 @@ jobs: submodules: recursive - name: Install boost - uses: MarkusJx/install-boost@v2.0.0 + uses: MarkusJx/install-boost@v1.0.1 id: install-boost with: # REQUIRED: Specify the required boost version # A list of supported versions can be found here: # https://github.com/actions/boost-versions/blob/main/versions-manifest.json - boost_version: 1.77.0 - # OPTIONAL: Specify a custom installation location - # boost_install_dir: 'C:' - # OPTIONAL: Specify a platform version - platform_version: 2019 + boost_version: 1.70.0 + # OPTIONAL: Specify a toolset on windows + toolset: msvc14.1 + # OPTIONAL: Specify a custom install location + #boost_install_dir: C:\some_directory # NOTE: If a boost version matching all requirements cannot be found, # this build step will fail From 1039160d3a9f33beba185d1a6752e6872082e86a Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 18 Dec 2021 20:57:11 -0500 Subject: [PATCH 024/106] Update pull-requests_build-check.yml -Try boost v1.73.0 built on windows server 2019 --- .github/workflows/pull-requests_build-check.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index a4d8a28340f..ea7ad4bc7b1 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -130,17 +130,17 @@ jobs: submodules: recursive - name: Install boost - uses: MarkusJx/install-boost@v1.0.1 + uses: MarkusJx/install-boost@v2.0.0 id: install-boost with: # REQUIRED: Specify the required boost version # A list of supported versions can be found here: # https://github.com/actions/boost-versions/blob/main/versions-manifest.json - boost_version: 1.70.0 - # OPTIONAL: Specify a toolset on windows - toolset: msvc14.1 - # OPTIONAL: Specify a custom install location - #boost_install_dir: C:\some_directory + boost_version: 1.73.0 + # OPTIONAL: Specify a custon install location + #boost_install_dir: 'C:' + # OPTIONAL: Specify a platform version + platform_version: 2019 # NOTE: If a boost version matching all requirements cannot be found, # this build step will fail @@ -153,7 +153,8 @@ jobs: run: | mkdir sunshine-windows-build && cd sunshine-windows-build set PATH=C:\msys64\mingw64\bin - cmake -DBOOST_ROOT=${{ steps.install-boost.outputs.BOOST_ROOT }} -DBOOST_INCLUDEDIR=${{ steps.install-boost.outputs.BOOST_ROOT }}/include -DBOOST_LIBRARYDIR=${{ steps.install-boost.outputs.BOOST_ROOT }}/lib -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. + cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. + #-DBOOST_ROOT=${{ steps.install-boost.outputs.BOOST_ROOT }} -DBOOST_INCLUDEDIR=${{ steps.install-boost.outputs.BOOST_ROOT }}/include -DBOOST_LIBRARYDIR=${{ steps.install-boost.outputs.BOOST_ROOT }}/lib mingw32-make -j2 - name: Package Windows run: | From 9fbfca5699112f604c6b409e3260fb4d8ba0dd6b Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 18 Dec 2021 21:19:23 -0500 Subject: [PATCH 025/106] Update pull-requests_build-check.yml -Try boost 1.72.0 --- .github/workflows/pull-requests_build-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index ea7ad4bc7b1..df3efca3bbd 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -136,7 +136,7 @@ jobs: # REQUIRED: Specify the required boost version # A list of supported versions can be found here: # https://github.com/actions/boost-versions/blob/main/versions-manifest.json - boost_version: 1.73.0 + boost_version: 1.72.0 # OPTIONAL: Specify a custon install location #boost_install_dir: 'C:' # OPTIONAL: Specify a platform version From 2512e7f445ae5f98d4b7e2f5f1e72042c217fce3 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 18 Dec 2021 22:22:27 -0500 Subject: [PATCH 026/106] Update pull-requests_build-check.yml -Testing --- .github/workflows/pull-requests_build-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index df3efca3bbd..02a0b2d83c0 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -153,7 +153,7 @@ jobs: run: | mkdir sunshine-windows-build && cd sunshine-windows-build set PATH=C:\msys64\mingw64\bin - cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. + cmake -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. #-DBOOST_ROOT=${{ steps.install-boost.outputs.BOOST_ROOT }} -DBOOST_INCLUDEDIR=${{ steps.install-boost.outputs.BOOST_ROOT }}/include -DBOOST_LIBRARYDIR=${{ steps.install-boost.outputs.BOOST_ROOT }}/lib mingw32-make -j2 - name: Package Windows From 3f2ee64293792ec39f1607744cba7bb49dd3e93d Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 18 Dec 2021 22:39:07 -0500 Subject: [PATCH 027/106] Update pull-requests_build-check.yml -Testing --- .github/workflows/pull-requests_build-check.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 02a0b2d83c0..b2a4e65c004 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -153,7 +153,8 @@ jobs: run: | mkdir sunshine-windows-build && cd sunshine-windows-build set PATH=C:\msys64\mingw64\bin - cmake -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. + #cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. + cmake -DBOOST_INCLUDEDIR=C:\msys64\mingw64\include\boost -DBOOST_LIBRARYDIR=C:\msys64\mingw64\lib -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. #-DBOOST_ROOT=${{ steps.install-boost.outputs.BOOST_ROOT }} -DBOOST_INCLUDEDIR=${{ steps.install-boost.outputs.BOOST_ROOT }}/include -DBOOST_LIBRARYDIR=${{ steps.install-boost.outputs.BOOST_ROOT }}/lib mingw32-make -j2 - name: Package Windows From ed38b7e86c090e8a32d5aff2d39cf4e4c7b0eb04 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 18 Dec 2021 23:35:41 -0500 Subject: [PATCH 028/106] Update pull-requests_build-check.yml -Testing --- .github/workflows/pull-requests_build-check.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index b2a4e65c004..09c4c75333d 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -152,10 +152,11 @@ jobs: BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} run: | mkdir sunshine-windows-build && cd sunshine-windows-build - set PATH=C:\msys64\mingw64\bin - #cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. - cmake -DBOOST_INCLUDEDIR=C:\msys64\mingw64\include\boost -DBOOST_LIBRARYDIR=C:\msys64\mingw64\lib -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. - #-DBOOST_ROOT=${{ steps.install-boost.outputs.BOOST_ROOT }} -DBOOST_INCLUDEDIR=${{ steps.install-boost.outputs.BOOST_ROOT }}/include -DBOOST_LIBRARYDIR=${{ steps.install-boost.outputs.BOOST_ROOT }}/lib + set PATH=%PATH%;C:\msys64\mingw64\bin + set BOOST_ROOT=${{ steps.install-boost.outputs.BOOST_ROOT }} + set BOOST_INCLUDEDIR=${{ steps.install-boost.outputs.BOOST_ROOT }} + set BOOST_LIBRARYDIR=${{ steps.install-boost.outputs.BOOST_ROOT }}\lib + cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. mingw32-make -j2 - name: Package Windows run: | From ff47a13bc3b12b79785d7a14de4bffcdbf138219 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 18 Dec 2021 23:44:02 -0500 Subject: [PATCH 029/106] Update pull-requests_build-check.yml --- .github/workflows/pull-requests_build-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 09c4c75333d..f8c11834573 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -152,7 +152,7 @@ jobs: BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} run: | mkdir sunshine-windows-build && cd sunshine-windows-build - set PATH=%PATH%;C:\msys64\mingw64\bin + set PATH=C:\msys64\mingw64\bin set BOOST_ROOT=${{ steps.install-boost.outputs.BOOST_ROOT }} set BOOST_INCLUDEDIR=${{ steps.install-boost.outputs.BOOST_ROOT }} set BOOST_LIBRARYDIR=${{ steps.install-boost.outputs.BOOST_ROOT }}\lib From 17770fe130a982c41a93fd174a4cdb68cc21b310 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 00:04:20 -0500 Subject: [PATCH 030/106] Update pull-requests_build-check.yml --- .github/workflows/pull-requests_build-check.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index f8c11834573..0b9d5f7bd71 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -136,9 +136,9 @@ jobs: # REQUIRED: Specify the required boost version # A list of supported versions can be found here: # https://github.com/actions/boost-versions/blob/main/versions-manifest.json - boost_version: 1.72.0 - # OPTIONAL: Specify a custon install location - #boost_install_dir: 'C:' + boost_version: 1.77.0 + # OPTIONAL: Specify a custom install location + boost_install_dir: 'C:' # OPTIONAL: Specify a platform version platform_version: 2019 @@ -153,9 +153,13 @@ jobs: run: | mkdir sunshine-windows-build && cd sunshine-windows-build set PATH=C:\msys64\mingw64\bin - set BOOST_ROOT=${{ steps.install-boost.outputs.BOOST_ROOT }} - set BOOST_INCLUDEDIR=${{ steps.install-boost.outputs.BOOST_ROOT }} - set BOOST_LIBRARYDIR=${{ steps.install-boost.outputs.BOOST_ROOT }}\lib + set BOOST_ROOT=C:\boost + dir C:\boost + echo ----------- + set BOOST_INCLUDEDIR=C:\boost + set BOOST_LIBRARYDIR=C:\boost\lib + dir C:\boost\lib + echo ----------- cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. mingw32-make -j2 - name: Package Windows From 4406f7428b45f706cc4a1533d86262fc78fc668b Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 00:11:15 -0500 Subject: [PATCH 031/106] Update pull-requests_build-check.yml --- .github/workflows/pull-requests_build-check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 0b9d5f7bd71..c698e74126b 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -154,11 +154,11 @@ jobs: mkdir sunshine-windows-build && cd sunshine-windows-build set PATH=C:\msys64\mingw64\bin set BOOST_ROOT=C:\boost - dir C:\boost + dir C:\boost\boost echo ----------- set BOOST_INCLUDEDIR=C:\boost set BOOST_LIBRARYDIR=C:\boost\lib - dir C:\boost\lib + dir C:\boost\boost\lib echo ----------- cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. mingw32-make -j2 From a5e2df11ebfa681d6f16b9560f5e2787aa6660e0 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 00:42:34 -0500 Subject: [PATCH 032/106] Update pull-requests_build-check.yml --- .github/workflows/pull-requests_build-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index c698e74126b..4e870034932 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -160,7 +160,7 @@ jobs: set BOOST_LIBRARYDIR=C:\boost\lib dir C:\boost\boost\lib echo ----------- - cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. + cmake -DBoost_USE_STATIC_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. mingw32-make -j2 - name: Package Windows run: | From 23e64f23a84d1518f3bc892de75f6321e2314297 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 10:40:11 -0500 Subject: [PATCH 033/106] Add additional distros --- .../workflows/pull-requests_build-check.yml | 9 +++------ appveyor.yml | 4 ++-- scripts/Dockerfile-Fedora_33 | 13 +++++++++++++ scripts/Dockerfile-Fedora_35 | 14 ++++++++++++++ ...Dockerfile-2004 => Dockerfile-Ubuntu_18_04} | 2 +- scripts/Dockerfile-Ubuntu_20_04 | 18 ++++++++++++++++++ ...Dockerfile-2104 => Dockerfile-Ubuntu_21_04} | 2 +- scripts/Dockerfile-Ubuntu_21_10 | 13 +++++++++++++ 8 files changed, 65 insertions(+), 10 deletions(-) create mode 100644 scripts/Dockerfile-Fedora_33 create mode 100644 scripts/Dockerfile-Fedora_35 rename scripts/{Dockerfile-2004 => Dockerfile-Ubuntu_18_04} (95%) create mode 100644 scripts/Dockerfile-Ubuntu_20_04 rename scripts/{Dockerfile-2104 => Dockerfile-Ubuntu_21_04} (92%) create mode 100644 scripts/Dockerfile-Ubuntu_21_10 diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 4e870034932..3eb511ac7bb 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.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 - echo ----------- - cmake -DBoost_USE_STATIC_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. + cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. mingw32-make -j2 - name: Package Windows run: | diff --git a/appveyor.yml b/appveyor.yml index 7a418aaaa02..40d6b8079a0 100644 --- a/appveyor.yml +++ b/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 diff --git a/scripts/Dockerfile-Fedora_33 b/scripts/Dockerfile-Fedora_33 new file mode 100644 index 00000000000..48507f6401d --- /dev/null +++ b/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"] diff --git a/scripts/Dockerfile-Fedora_35 b/scripts/Dockerfile-Fedora_35 new file mode 100644 index 00000000000..c311cd65676 --- /dev/null +++ b/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"] diff --git a/scripts/Dockerfile-2004 b/scripts/Dockerfile-Ubuntu_18_04 similarity index 95% rename from scripts/Dockerfile-2004 rename to scripts/Dockerfile-Ubuntu_18_04 index fe4dc326fc9..b3d44bbe818 100644 --- a/scripts/Dockerfile-2004 +++ b/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" diff --git a/scripts/Dockerfile-Ubuntu_20_04 b/scripts/Dockerfile-Ubuntu_20_04 new file mode 100644 index 00000000000..ea69f4558a4 --- /dev/null +++ b/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"] diff --git a/scripts/Dockerfile-2104 b/scripts/Dockerfile-Ubuntu_21_04 similarity index 92% rename from scripts/Dockerfile-2104 rename to scripts/Dockerfile-Ubuntu_21_04 index b8174a36c60..83c1748306f 100644 --- a/scripts/Dockerfile-2104 +++ b/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" diff --git a/scripts/Dockerfile-Ubuntu_21_10 b/scripts/Dockerfile-Ubuntu_21_10 new file mode 100644 index 00000000000..a7f65f3bdcc --- /dev/null +++ b/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"] From 7d51a4bfbfa409bcb179c3eca0a5775b3822d78e Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 10:45:29 -0500 Subject: [PATCH 034/106] change linux names to lowercase --- .github/workflows/pull-requests_build-check.yml | 2 +- appveyor.yml | 4 ++-- scripts/{Dockerfile-Fedora_33 => Dockerfile-fedora_33} | 0 scripts/{Dockerfile-Fedora_35 => Dockerfile-fedora_35} | 0 scripts/{Dockerfile-Ubuntu_18_04 => Dockerfile-ubuntu_18_04} | 0 scripts/{Dockerfile-Ubuntu_20_04 => Dockerfile-ubuntu_20_04} | 0 scripts/{Dockerfile-Ubuntu_21_04 => Dockerfile-ubuntu_21_04} | 0 scripts/{Dockerfile-Ubuntu_21_10 => Dockerfile-ubuntu_21_10} | 0 8 files changed, 3 insertions(+), 3 deletions(-) rename scripts/{Dockerfile-Fedora_33 => Dockerfile-fedora_33} (100%) rename scripts/{Dockerfile-Fedora_35 => Dockerfile-fedora_35} (100%) rename scripts/{Dockerfile-Ubuntu_18_04 => Dockerfile-ubuntu_18_04} (100%) rename scripts/{Dockerfile-Ubuntu_20_04 => Dockerfile-ubuntu_20_04} (100%) rename scripts/{Dockerfile-Ubuntu_21_04 => Dockerfile-ubuntu_21_04} (100%) rename scripts/{Dockerfile-Ubuntu_21_10 => Dockerfile-ubuntu_21_10} (100%) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 3eb511ac7bb..4d360ed6339 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -91,7 +91,7 @@ jobs: strategy: fail-fast: false matrix: - distro: [ debian, Fedora_33, Fedora_35, Ubuntu_18_04, Ubuntu_20_04, Ubuntu_21_04, Ubuntu_21_10 ] + distro: [ debian, fedora_33, fedora_35, ubuntu_18_04, ubuntu_20_04, ubuntu_21_04, ubuntu_21_10 ] steps: - name: Checkout diff --git a/appveyor.yml b/appveyor.yml index 40d6b8079a0..7fb08089e83 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,9 +4,9 @@ services: environment: matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 - DOCKERFILE: Dockerfile-Ubuntu_20_04 + DOCKERFILE: Dockerfile-ubuntu_20_04 - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 - DOCKERFILE: Dockerfile-Ubuntu_21_04 + DOCKERFILE: Dockerfile-ubuntu_21_04 - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 DOCKERFILE: Dockerfile-debian - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 diff --git a/scripts/Dockerfile-Fedora_33 b/scripts/Dockerfile-fedora_33 similarity index 100% rename from scripts/Dockerfile-Fedora_33 rename to scripts/Dockerfile-fedora_33 diff --git a/scripts/Dockerfile-Fedora_35 b/scripts/Dockerfile-fedora_35 similarity index 100% rename from scripts/Dockerfile-Fedora_35 rename to scripts/Dockerfile-fedora_35 diff --git a/scripts/Dockerfile-Ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 similarity index 100% rename from scripts/Dockerfile-Ubuntu_18_04 rename to scripts/Dockerfile-ubuntu_18_04 diff --git a/scripts/Dockerfile-Ubuntu_20_04 b/scripts/Dockerfile-ubuntu_20_04 similarity index 100% rename from scripts/Dockerfile-Ubuntu_20_04 rename to scripts/Dockerfile-ubuntu_20_04 diff --git a/scripts/Dockerfile-Ubuntu_21_04 b/scripts/Dockerfile-ubuntu_21_04 similarity index 100% rename from scripts/Dockerfile-Ubuntu_21_04 rename to scripts/Dockerfile-ubuntu_21_04 diff --git a/scripts/Dockerfile-Ubuntu_21_10 b/scripts/Dockerfile-ubuntu_21_10 similarity index 100% rename from scripts/Dockerfile-Ubuntu_21_10 rename to scripts/Dockerfile-ubuntu_21_10 From 143ca274f542039208e1f9c7ec5798ab315b90ec Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 11:06:06 -0500 Subject: [PATCH 035/106] Update Dockerfile-fedora_33 --- scripts/Dockerfile-fedora_33 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/scripts/Dockerfile-fedora_33 b/scripts/Dockerfile-fedora_33 index 48507f6401d..cf0b138fd25 100644 --- a/scripts/Dockerfile-fedora_33 +++ b/scripts/Dockerfile-fedora_33 @@ -1,11 +1,9 @@ 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 +RUN dnf -y update && \ + dnf -y group install "Development Tools" \ + dnf -y 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 -y install 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 From 7b5ac1c86980cb459a90bb5421e5a76227981620 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 11:06:09 -0500 Subject: [PATCH 036/106] Update Dockerfile-fedora_35 --- scripts/Dockerfile-fedora_35 | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/Dockerfile-fedora_35 b/scripts/Dockerfile-fedora_35 index c311cd65676..ef18d6f03f3 100644 --- a/scripts/Dockerfile-fedora_35 +++ b/scripts/Dockerfile-fedora_35 @@ -1,12 +1,10 @@ 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 +RUN dnf -y update && \ + dnf -y group install "Development Tools" \ + dnf -y 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 -y install 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 -y install libXcursor-devel libXrandr-devel libXinerama-devel libXi-devel mesa-libGL-devel COPY build-private.sh /root/build.sh From 23c6e455fe0846b4ee0afa75c502e4d4e0e7ebb3 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 11:10:40 -0500 Subject: [PATCH 037/106] Update Dockerfile-ubuntu_18_04 -Fix gcc-10 --- scripts/Dockerfile-ubuntu_18_04 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index b3d44bbe818..eec1a4ac6ef 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -5,7 +5,10 @@ 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 + git wget 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 \ + add-apt-repository ppa:ubuntu-toolchain-r/test && \ + apt-get update -y && \ + apt-get install -y gcc-10 RUN cp /usr/bin/gcc-10 /usr/bin/gcc && cp /usr/bin/g++-10 /usr/bin/gcc-10 From d1ab44912b2564d613db89e117693aeb833c3e0a Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 13:23:06 -0500 Subject: [PATCH 038/106] Fix dockerfile --- scripts/Dockerfile-fedora_33 | 4 ++-- scripts/Dockerfile-fedora_35 | 6 +++--- scripts/Dockerfile-ubuntu_18_04 | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/Dockerfile-fedora_33 b/scripts/Dockerfile-fedora_33 index cf0b138fd25..793e64e4bfd 100644 --- a/scripts/Dockerfile-fedora_33 +++ b/scripts/Dockerfile-fedora_33 @@ -1,8 +1,8 @@ FROM fedora:33 AS sunshine-fedora_33 RUN dnf -y update && \ - dnf -y group install "Development Tools" \ - dnf -y 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 -y group install "Development Tools" && \ + dnf -y 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 -y install 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 diff --git a/scripts/Dockerfile-fedora_35 b/scripts/Dockerfile-fedora_35 index ef18d6f03f3..80e39eecdae 100644 --- a/scripts/Dockerfile-fedora_35 +++ b/scripts/Dockerfile-fedora_35 @@ -1,9 +1,9 @@ FROM fedora:33 AS sunshine-fedora_33 RUN dnf -y update && \ - dnf -y group install "Development Tools" \ - dnf -y 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 -y install 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 -y group install "Development Tools" && \ + dnf -y 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 -y install 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 -y install libXcursor-devel libXrandr-devel libXinerama-devel libXi-devel mesa-libGL-devel COPY build-private.sh /root/build.sh diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index eec1a4ac6ef..2941a0b1f69 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -5,7 +5,7 @@ ARG TZ="Europe/London" RUN apt-get update -y && \ apt-get install -y \ - git wget 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 \ + git wget 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 && \ add-apt-repository ppa:ubuntu-toolchain-r/test && \ apt-get update -y && \ apt-get install -y gcc-10 From 5ff5d46ba555205986d2bea9487b854a634b2ff5 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 14:41:04 -0500 Subject: [PATCH 039/106] Cleanup dockerfiles --- scripts/Dockerfile-debian | 27 ++++++++++++++++++++++++- scripts/Dockerfile-fedora_33 | 18 +++++++++++++++-- scripts/Dockerfile-fedora_35 | 24 +++++++++++++++++++--- scripts/Dockerfile-ubuntu_18_04 | 35 ++++++++++++++++++++++++++++----- scripts/Dockerfile-ubuntu_20_04 | 27 ++++++++++++++++++++++++- scripts/Dockerfile-ubuntu_21_04 | 27 ++++++++++++++++++++++++- scripts/Dockerfile-ubuntu_21_10 | 27 ++++++++++++++++++++++++- 7 files changed, 171 insertions(+), 14 deletions(-) diff --git a/scripts/Dockerfile-debian b/scripts/Dockerfile-debian index 253a4d45c35..0444edc77fe 100644 --- a/scripts/Dockerfile-debian +++ b/scripts/Dockerfile-debian @@ -6,7 +6,32 @@ ARG TZ="Europe/London" RUN echo deb http://deb.debian.org/debian/ bullseye main contrib non-free | tee /etc/apt/sources.list.d/non-free.list 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 + build-essential \ + cmake \ + git \ + libavdevice-dev \ + libboost-thread-dev \ + libboost-filesystem-dev \ + libboost-log-dev \ + libcap-dev \ + libdrm-dev \ + libevdev-dev \ + libpulse-dev \ + libopus-dev \ + libssl-dev \ + libwayland-dev \ + libx11-dev \ + libxcb-shm0-dev \ + libxcb-xfixes0-dev \ + libxcb1-dev \ + libxfixes-dev \ + libxrandr-dev \ + libxtst-dev \ + nvidia-cuda-dev \ + nvidia-cuda-toolkit \ + && \ + apt-get clean && \ + apt-get autoclean COPY build-private.sh /root/build.sh diff --git a/scripts/Dockerfile-fedora_33 b/scripts/Dockerfile-fedora_33 index 793e64e4bfd..03075d04084 100644 --- a/scripts/Dockerfile-fedora_33 +++ b/scripts/Dockerfile-fedora_33 @@ -2,8 +2,22 @@ FROM fedora:33 AS sunshine-fedora_33 RUN dnf -y update && \ dnf -y group install "Development Tools" && \ - dnf -y 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 -y install 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 -y 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 \ + boost-devel \ + boost-static.x86_64 \ + cmake \ + ffmpeg-devel \ + libevdev-devel \ + libxcb-devel \ + libX11-devel \ + libXfixes-devel \ + libXtst-devel \ + openssl-devel \ + opus-devel \ + pulseaudio-libs-devel \ + && \ + dnf clean all && \ + rm -rf /var/cache/yum COPY build-private.sh /root/build.sh diff --git a/scripts/Dockerfile-fedora_35 b/scripts/Dockerfile-fedora_35 index 80e39eecdae..04628c098b3 100644 --- a/scripts/Dockerfile-fedora_35 +++ b/scripts/Dockerfile-fedora_35 @@ -2,9 +2,27 @@ FROM fedora:33 AS sunshine-fedora_33 RUN dnf -y update && \ dnf -y group install "Development Tools" && \ - dnf -y 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 -y install 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 -y install libXcursor-devel libXrandr-devel libXinerama-devel libXi-devel mesa-libGL-devel + dnf -y 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 \ + boost-devel \ + boost-static.x86_64 \ + cmake \ + ffmpeg-devel \ + libevdev-devel \ + libxcb-devel \ + libX11-devel \ + libXcursor-devel \ + libXfixes-devel \ + libXinerama-devel \ + libXi-devel \ + libXrandr-devel \ + libXtst-devel \ + mesa-libGL-devel \ + openssl-devel \ + opus-devel \ + pulseaudio-libs-devel \ + && \ + dnf clean all && \ + rm -rf /var/cache/yum COPY build-private.sh /root/build.sh diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index 2941a0b1f69..1b8ffd18845 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -3,12 +3,37 @@ FROM ubuntu:18.04 AS sunshine-ubuntu_18_04 ARG DEBIAN_FRONTEND=noninteractive ARG TZ="Europe/London" -RUN apt-get update -y && \ - apt-get install -y \ - git wget 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 && \ - add-apt-repository ppa:ubuntu-toolchain-r/test && \ +RUN add-apt-repository ppa:ubuntu-toolchain-r/test && \ apt-get update -y && \ - apt-get install -y gcc-10 + apt-get install -y \ + build-essential \ + cmake \ + gcc-10 + git \ + g++-10 \ + libavdevice-dev \ + libboost-thread-dev \ + libboost-filesystem-dev \ + libboost-log-dev \ + libcap-dev \ + libdrm-dev \ + libevdev-dev \ + libpulse-dev \ + libopus-dev \ + libssl-dev \ + libwayland-dev \ + libx11-dev \ + libxcb-shm0-dev \ + libxcb-xfixes0-dev \ + libxcb1-dev \ + libxfixes-dev \ + libxrandr-dev \ + libxtst-dev \ + software-properties-common \ + wget \ + && \ + apt-get clean && \ + apt-get autoclean RUN cp /usr/bin/gcc-10 /usr/bin/gcc && cp /usr/bin/g++-10 /usr/bin/gcc-10 diff --git a/scripts/Dockerfile-ubuntu_20_04 b/scripts/Dockerfile-ubuntu_20_04 index ea69f4558a4..75169813f62 100644 --- a/scripts/Dockerfile-ubuntu_20_04 +++ b/scripts/Dockerfile-ubuntu_20_04 @@ -5,7 +5,32 @@ 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 + build-essential \ + cmake \ + git \ + g++-10 \ + libavdevice-dev \ + libboost-thread-dev \ + libboost-filesystem-dev \ + libboost-log-dev \ + libcap-dev \ + libdrm-dev \ + libevdev-dev \ + libpulse-dev \ + libopus-dev \ + libssl-dev \ + libwayland-dev \ + libx11-dev \ + libxcb-shm0-dev \ + libxcb-xfixes0-dev \ + libxcb1-dev \ + libxfixes-dev \ + libxrandr-dev \ + libxtst-dev \ + wget \ + && \ + apt-get clean && \ + apt-get autoclean RUN cp /usr/bin/gcc-10 /usr/bin/gcc && cp /usr/bin/g++-10 /usr/bin/gcc-10 diff --git a/scripts/Dockerfile-ubuntu_21_04 b/scripts/Dockerfile-ubuntu_21_04 index 83c1748306f..1972e2beff9 100644 --- a/scripts/Dockerfile-ubuntu_21_04 +++ b/scripts/Dockerfile-ubuntu_21_04 @@ -5,7 +5,32 @@ 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 + build-essential \ + cmake \ + git \ + libavdevice-dev \ + libboost-thread-dev \ + libboost-filesystem-dev \ + libboost-log-dev \ + libcap-dev \ + libdrm-dev \ + libevdev-dev \ + libpulse-dev \ + libopus-dev \ + libssl-dev \ + libwayland-dev \ + libx11-dev \ + libxcb-shm0-dev \ + libxcb-xfixes0-dev \ + libxcb1-dev \ + libxfixes-dev \ + libxrandr-dev \ + libxtst-dev \ + nvidia-cuda-dev \ + nvidia-cuda-toolkit \ + && \ + apt-get clean && \ + apt-get autoclean COPY build-private.sh /root/build.sh diff --git a/scripts/Dockerfile-ubuntu_21_10 b/scripts/Dockerfile-ubuntu_21_10 index a7f65f3bdcc..d5fab928ea2 100644 --- a/scripts/Dockerfile-ubuntu_21_10 +++ b/scripts/Dockerfile-ubuntu_21_10 @@ -5,7 +5,32 @@ 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 + build-essential \ + cmake \ + git \ + libavdevice-dev \ + libboost-thread-dev \ + libboost-filesystem-dev \ + libboost-log-dev \ + libcap-dev \ + libdrm-dev \ + libevdev-dev \ + libpulse-dev \ + libopus-dev \ + libssl-dev \ + libwayland-dev \ + libx11-dev \ + libxcb-shm0-dev \ + libxcb-xfixes0-dev \ + libxcb1-dev \ + libxfixes-dev \ + libxrandr-dev \ + libxtst-dev \ + nvidia-cuda-dev \ + nvidia-cuda-toolkit \ + && \ + apt-get clean && \ + apt-get autoclean COPY build-private.sh /root/build.sh From 030269b5969d35f810b7cddb154b14a195de82cb Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 14:55:53 -0500 Subject: [PATCH 040/106] Cleanup dockerfiles --- scripts/Dockerfile-debian | 8 ++++---- scripts/Dockerfile-fedora_33 | 5 ++--- scripts/Dockerfile-fedora_35 | 5 ++--- scripts/Dockerfile-ubuntu_18_04 | 9 ++++----- scripts/Dockerfile-ubuntu_20_04 | 7 +++---- scripts/Dockerfile-ubuntu_21_04 | 7 +++---- scripts/Dockerfile-ubuntu_21_10 | 7 +++---- 7 files changed, 21 insertions(+), 27 deletions(-) diff --git a/scripts/Dockerfile-debian b/scripts/Dockerfile-debian index 0444edc77fe..fbcffd74a6d 100644 --- a/scripts/Dockerfile-debian +++ b/scripts/Dockerfile-debian @@ -3,9 +3,10 @@ FROM debian:bullseye AS sunshine-debian ARG DEBIAN_FRONTEND=noninteractive ARG TZ="Europe/London" +SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN echo deb http://deb.debian.org/debian/ bullseye main contrib non-free | tee /etc/apt/sources.list.d/non-free.list RUN apt-get update -y && \ - apt-get install -y \ + apt-get install -y --no-install-recommends \ build-essential \ cmake \ git \ @@ -29,9 +30,8 @@ RUN apt-get update -y && \ libxtst-dev \ nvidia-cuda-dev \ nvidia-cuda-toolkit \ - && \ - apt-get clean && \ - apt-get autoclean + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* COPY build-private.sh /root/build.sh diff --git a/scripts/Dockerfile-fedora_33 b/scripts/Dockerfile-fedora_33 index 03075d04084..af5a40be554 100644 --- a/scripts/Dockerfile-fedora_33 +++ b/scripts/Dockerfile-fedora_33 @@ -15,9 +15,8 @@ RUN dnf -y update && \ openssl-devel \ opus-devel \ pulseaudio-libs-devel \ - && \ - dnf clean all && \ - rm -rf /var/cache/yum + && dnf clean all \ + && rm -rf /var/cache/yum COPY build-private.sh /root/build.sh diff --git a/scripts/Dockerfile-fedora_35 b/scripts/Dockerfile-fedora_35 index 04628c098b3..6596f561ca4 100644 --- a/scripts/Dockerfile-fedora_35 +++ b/scripts/Dockerfile-fedora_35 @@ -20,9 +20,8 @@ RUN dnf -y update && \ openssl-devel \ opus-devel \ pulseaudio-libs-devel \ - && \ - dnf clean all && \ - rm -rf /var/cache/yum + && dnf clean all \ + && rm -rf /var/cache/yum COPY build-private.sh /root/build.sh diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index 1b8ffd18845..2ceac2b504e 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -5,10 +5,10 @@ ARG TZ="Europe/London" RUN add-apt-repository ppa:ubuntu-toolchain-r/test && \ apt-get update -y && \ - apt-get install -y \ + apt-get install -y --no-install-recommends \ build-essential \ cmake \ - gcc-10 + gcc-10 \ git \ g++-10 \ libavdevice-dev \ @@ -31,9 +31,8 @@ RUN add-apt-repository ppa:ubuntu-toolchain-r/test && \ libxtst-dev \ software-properties-common \ wget \ - && \ - apt-get clean && \ - apt-get autoclean + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* RUN cp /usr/bin/gcc-10 /usr/bin/gcc && cp /usr/bin/g++-10 /usr/bin/gcc-10 diff --git a/scripts/Dockerfile-ubuntu_20_04 b/scripts/Dockerfile-ubuntu_20_04 index 75169813f62..e6baea1af1f 100644 --- a/scripts/Dockerfile-ubuntu_20_04 +++ b/scripts/Dockerfile-ubuntu_20_04 @@ -4,7 +4,7 @@ ARG DEBIAN_FRONTEND=noninteractive ARG TZ="Europe/London" RUN apt-get update -y && \ - apt-get install -y \ + apt-get install -y --no-install-recommends \ build-essential \ cmake \ git \ @@ -28,9 +28,8 @@ RUN apt-get update -y && \ libxrandr-dev \ libxtst-dev \ wget \ - && \ - apt-get clean && \ - apt-get autoclean + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* RUN cp /usr/bin/gcc-10 /usr/bin/gcc && cp /usr/bin/g++-10 /usr/bin/gcc-10 diff --git a/scripts/Dockerfile-ubuntu_21_04 b/scripts/Dockerfile-ubuntu_21_04 index 1972e2beff9..a584d6e3a43 100644 --- a/scripts/Dockerfile-ubuntu_21_04 +++ b/scripts/Dockerfile-ubuntu_21_04 @@ -4,7 +4,7 @@ ARG DEBIAN_FRONTEND=noninteractive ARG TZ="Europe/London" RUN apt-get update -y && \ - apt-get install -y \ + apt-get install -y --no-install-recommends \ build-essential \ cmake \ git \ @@ -28,9 +28,8 @@ RUN apt-get update -y && \ libxtst-dev \ nvidia-cuda-dev \ nvidia-cuda-toolkit \ - && \ - apt-get clean && \ - apt-get autoclean + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* COPY build-private.sh /root/build.sh diff --git a/scripts/Dockerfile-ubuntu_21_10 b/scripts/Dockerfile-ubuntu_21_10 index d5fab928ea2..dc0672312a4 100644 --- a/scripts/Dockerfile-ubuntu_21_10 +++ b/scripts/Dockerfile-ubuntu_21_10 @@ -4,7 +4,7 @@ ARG DEBIAN_FRONTEND=noninteractive ARG TZ="Europe/London" RUN apt-get update -y && \ - apt-get install -y \ + apt-get install -y --no-install-recommends \ build-essential \ cmake \ git \ @@ -28,9 +28,8 @@ RUN apt-get update -y && \ libxtst-dev \ nvidia-cuda-dev \ nvidia-cuda-toolkit \ - && \ - apt-get clean && \ - apt-get autoclean + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* COPY build-private.sh /root/build.sh From a622c1591ecd23d20c01a25fcd2a0d7cff8a5ecb Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 15:04:54 -0500 Subject: [PATCH 041/106] Rename job deb to Linux --- .github/workflows/pull-requests_build-check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 4d360ed6339..bce55cfe22b 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -85,8 +85,8 @@ jobs: name: sunshine-AppImage path: artifacts/ - build_deb: - name: deb + build_linux: + name: Linux runs-on: ubuntu-20.04 strategy: fail-fast: false From 95baeed75ed2dfe6d20e42f651ca1adbd71dfa1d Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 15:05:23 -0500 Subject: [PATCH 042/106] Re-order RUN command --- scripts/Dockerfile-ubuntu_18_04 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index 2ceac2b504e..0ef8a085362 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -3,7 +3,9 @@ FROM ubuntu:18.04 AS sunshine-ubuntu_18_04 ARG DEBIAN_FRONTEND=noninteractive ARG TZ="Europe/London" -RUN add-apt-repository ppa:ubuntu-toolchain-r/test && \ +RUN apt-get update -y && \ + apt-get install -y --no-install-recommends software-properties-common && \ + add-apt-repository ppa:ubuntu-toolchain-r/test && \ apt-get update -y && \ apt-get install -y --no-install-recommends \ build-essential \ @@ -29,7 +31,6 @@ RUN add-apt-repository ppa:ubuntu-toolchain-r/test && \ libxfixes-dev \ libxrandr-dev \ libxtst-dev \ - software-properties-common \ wget \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* From 906870d36f2a8e6a0c297ee6232dd8307f749f3b Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 15:23:11 -0500 Subject: [PATCH 043/106] Back to single line install command -Testing, dockerfiles fail when packages split into multiple lines --- scripts/Dockerfile-fedora_33 | 15 ++------------- scripts/Dockerfile-fedora_35 | 20 ++------------------ 2 files changed, 4 insertions(+), 31 deletions(-) diff --git a/scripts/Dockerfile-fedora_33 b/scripts/Dockerfile-fedora_33 index af5a40be554..4e2c04de3f4 100644 --- a/scripts/Dockerfile-fedora_33 +++ b/scripts/Dockerfile-fedora_33 @@ -2,19 +2,8 @@ FROM fedora:33 AS sunshine-fedora_33 RUN dnf -y update && \ dnf -y group install "Development Tools" && \ - dnf -y 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 \ - boost-devel \ - boost-static.x86_64 \ - cmake \ - ffmpeg-devel \ - libevdev-devel \ - libxcb-devel \ - libX11-devel \ - libXfixes-devel \ - libXtst-devel \ - openssl-devel \ - opus-devel \ - pulseaudio-libs-devel \ + dnf -y 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 -y install boost-devel boost-static.x86_64 cmake ffmpeg-devel libevdev-devel libxcb-devel libX11-devel libXfixes-devel libXtst-devel openssl-devel opus-devel pulseaudio-libs-devel \ && dnf clean all \ && rm -rf /var/cache/yum diff --git a/scripts/Dockerfile-fedora_35 b/scripts/Dockerfile-fedora_35 index 6596f561ca4..cec2c960ae5 100644 --- a/scripts/Dockerfile-fedora_35 +++ b/scripts/Dockerfile-fedora_35 @@ -2,24 +2,8 @@ FROM fedora:33 AS sunshine-fedora_33 RUN dnf -y update && \ dnf -y group install "Development Tools" && \ - dnf -y 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 \ - boost-devel \ - boost-static.x86_64 \ - cmake \ - ffmpeg-devel \ - libevdev-devel \ - libxcb-devel \ - libX11-devel \ - libXcursor-devel \ - libXfixes-devel \ - libXinerama-devel \ - libXi-devel \ - libXrandr-devel \ - libXtst-devel \ - mesa-libGL-devel \ - openssl-devel \ - opus-devel \ - pulseaudio-libs-devel \ + dnf -y 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 -y install boost-devel boost-static.x86_64 cmake ffmpeg-devel libevdev-devel libxcb-devel libX11-devel libXcursor-devel libXfixes-devel libXinerama-devel libXi-devel libXrandr-devel libXtst-devel mesa-libGL-devel openssl-devel opus-devel pulseaudio-libs-devel \ && dnf clean all \ && rm -rf /var/cache/yum From b41cbc8ab4937578c2977f0960fb7034e20925da Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 15:24:02 -0500 Subject: [PATCH 044/106] Fix fedora version --- scripts/Dockerfile-fedora_35 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Dockerfile-fedora_35 b/scripts/Dockerfile-fedora_35 index cec2c960ae5..58b3f32ea61 100644 --- a/scripts/Dockerfile-fedora_35 +++ b/scripts/Dockerfile-fedora_35 @@ -1,4 +1,4 @@ -FROM fedora:33 AS sunshine-fedora_33 +FROM fedora:35 AS sunshine-fedora_35 RUN dnf -y update && \ dnf -y group install "Development Tools" && \ From 1e0db7df4e6875012745b73f998cd376963e18da Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 15:39:39 -0500 Subject: [PATCH 045/106] Rename deb to Linux --- .github/workflows/pull-requests_build-check.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index bce55cfe22b..c62ab5d8e09 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -99,17 +99,17 @@ jobs: with: submodules: recursive - - name: Setup Container deb + - name: Setup Container run: | mkdir -p artifacts cd scripts sudo ./build-container.sh -c build -f Dockerfile-${{ matrix.distro }} -n sunshine-${{ matrix.distro }} - - name: Build deb + - name: Build Linux run: | cd scripts sudo ./build-sunshine.sh -p -u -n sunshine-${{ matrix.distro }} -s .. - - name: Package deb + - name: Package Linux run: | cd scripts sudo mv ./sunshine-${{ matrix.distro }}-build/sunshine-${{ matrix.distro }}.deb ../artifacts/ From e07279707a81cd0ea381c753d037fee3bdfcbe53 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 15:40:12 -0500 Subject: [PATCH 046/106] Update dockerfiles -Fix spacing --- scripts/Dockerfile-fedora_33 | 13 ++++++++- scripts/Dockerfile-fedora_35 | 20 ++++++++++++-- scripts/Dockerfile-ubuntu_18_04 | 48 ++++++++++++++++----------------- scripts/Dockerfile-ubuntu_20_04 | 46 +++++++++++++++---------------- scripts/Dockerfile-ubuntu_21_04 | 46 +++++++++++++++---------------- scripts/Dockerfile-ubuntu_21_10 | 46 +++++++++++++++---------------- 6 files changed, 123 insertions(+), 96 deletions(-) diff --git a/scripts/Dockerfile-fedora_33 b/scripts/Dockerfile-fedora_33 index 4e2c04de3f4..c0143e8cebe 100644 --- a/scripts/Dockerfile-fedora_33 +++ b/scripts/Dockerfile-fedora_33 @@ -3,7 +3,18 @@ FROM fedora:33 AS sunshine-fedora_33 RUN dnf -y update && \ dnf -y group install "Development Tools" && \ dnf -y 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 -y install boost-devel boost-static.x86_64 cmake ffmpeg-devel libevdev-devel libxcb-devel libX11-devel libXfixes-devel libXtst-devel openssl-devel opus-devel pulseaudio-libs-devel \ + boost-devel \ + boost-static.x86_64 \ + cmake \ + ffmpeg-devel \ + libevdev-devel \ + libxcb-devel \ + libX11-devel \ + libXfixes-devel \ + libXtst-devel \ + openssl-devel \ + opus-devel \ + pulseaudio-libs-devel \ && dnf clean all \ && rm -rf /var/cache/yum diff --git a/scripts/Dockerfile-fedora_35 b/scripts/Dockerfile-fedora_35 index 58b3f32ea61..2beca2f89da 100644 --- a/scripts/Dockerfile-fedora_35 +++ b/scripts/Dockerfile-fedora_35 @@ -2,8 +2,24 @@ FROM fedora:35 AS sunshine-fedora_35 RUN dnf -y update && \ dnf -y group install "Development Tools" && \ - dnf -y 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 -y install boost-devel boost-static.x86_64 cmake ffmpeg-devel libevdev-devel libxcb-devel libX11-devel libXcursor-devel libXfixes-devel libXinerama-devel libXi-devel libXrandr-devel libXtst-devel mesa-libGL-devel openssl-devel opus-devel pulseaudio-libs-devel \ + dnf -y 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 \ + boost-devel \ + boost-static.x86_64 \ + cmake \ + ffmpeg-devel \ + libevdev-devel \ + libxcb-devel \ + libX11-devel \ + libXcursor-devel \ + libXfixes-devel \ + libXinerama-devel \ + libXi-devel \ + libXrandr-devel \ + libXtst-devel \ + mesa-libGL-devel \ + openssl-devel \ + opus-devel \ + pulseaudio-libs-devel \ && dnf clean all \ && rm -rf /var/cache/yum diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index 0ef8a085362..2c732eb5022 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -8,30 +8,30 @@ RUN apt-get update -y && \ add-apt-repository ppa:ubuntu-toolchain-r/test && \ apt-get update -y && \ apt-get install -y --no-install-recommends \ - build-essential \ - cmake \ - gcc-10 \ - git \ - g++-10 \ - libavdevice-dev \ - libboost-thread-dev \ - libboost-filesystem-dev \ - libboost-log-dev \ - libcap-dev \ - libdrm-dev \ - libevdev-dev \ - libpulse-dev \ - libopus-dev \ - libssl-dev \ - libwayland-dev \ - libx11-dev \ - libxcb-shm0-dev \ - libxcb-xfixes0-dev \ - libxcb1-dev \ - libxfixes-dev \ - libxrandr-dev \ - libxtst-dev \ - wget \ + build-essential \ + cmake \ + gcc-10 \ + git \ + g++-10 \ + libavdevice-dev \ + libboost-thread-dev \ + libboost-filesystem-dev \ + libboost-log-dev \ + libcap-dev \ + libdrm-dev \ + libevdev-dev \ + libpulse-dev \ + libopus-dev \ + libssl-dev \ + libwayland-dev \ + libx11-dev \ + libxcb-shm0-dev \ + libxcb-xfixes0-dev \ + libxcb1-dev \ + libxfixes-dev \ + libxrandr-dev \ + libxtst-dev \ + wget \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/scripts/Dockerfile-ubuntu_20_04 b/scripts/Dockerfile-ubuntu_20_04 index e6baea1af1f..713726a4430 100644 --- a/scripts/Dockerfile-ubuntu_20_04 +++ b/scripts/Dockerfile-ubuntu_20_04 @@ -5,29 +5,29 @@ ARG TZ="Europe/London" RUN apt-get update -y && \ apt-get install -y --no-install-recommends \ - build-essential \ - cmake \ - git \ - g++-10 \ - libavdevice-dev \ - libboost-thread-dev \ - libboost-filesystem-dev \ - libboost-log-dev \ - libcap-dev \ - libdrm-dev \ - libevdev-dev \ - libpulse-dev \ - libopus-dev \ - libssl-dev \ - libwayland-dev \ - libx11-dev \ - libxcb-shm0-dev \ - libxcb-xfixes0-dev \ - libxcb1-dev \ - libxfixes-dev \ - libxrandr-dev \ - libxtst-dev \ - wget \ + build-essential \ + cmake \ + git \ + g++-10 \ + libavdevice-dev \ + libboost-thread-dev \ + libboost-filesystem-dev \ + libboost-log-dev \ + libcap-dev \ + libdrm-dev \ + libevdev-dev \ + libpulse-dev \ + libopus-dev \ + libssl-dev \ + libwayland-dev \ + libx11-dev \ + libxcb-shm0-dev \ + libxcb-xfixes0-dev \ + libxcb1-dev \ + libxfixes-dev \ + libxrandr-dev \ + libxtst-dev \ + wget \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/scripts/Dockerfile-ubuntu_21_04 b/scripts/Dockerfile-ubuntu_21_04 index a584d6e3a43..6c644d4ecc3 100644 --- a/scripts/Dockerfile-ubuntu_21_04 +++ b/scripts/Dockerfile-ubuntu_21_04 @@ -5,29 +5,29 @@ ARG TZ="Europe/London" RUN apt-get update -y && \ apt-get install -y --no-install-recommends \ - build-essential \ - cmake \ - git \ - libavdevice-dev \ - libboost-thread-dev \ - libboost-filesystem-dev \ - libboost-log-dev \ - libcap-dev \ - libdrm-dev \ - libevdev-dev \ - libpulse-dev \ - libopus-dev \ - libssl-dev \ - libwayland-dev \ - libx11-dev \ - libxcb-shm0-dev \ - libxcb-xfixes0-dev \ - libxcb1-dev \ - libxfixes-dev \ - libxrandr-dev \ - libxtst-dev \ - nvidia-cuda-dev \ - nvidia-cuda-toolkit \ + build-essential \ + cmake \ + git \ + libavdevice-dev \ + libboost-thread-dev \ + libboost-filesystem-dev \ + libboost-log-dev \ + libcap-dev \ + libdrm-dev \ + libevdev-dev \ + libpulse-dev \ + libopus-dev \ + libssl-dev \ + libwayland-dev \ + libx11-dev \ + libxcb-shm0-dev \ + libxcb-xfixes0-dev \ + libxcb1-dev \ + libxfixes-dev \ + libxrandr-dev \ + libxtst-dev \ + nvidia-cuda-dev \ + nvidia-cuda-toolkit \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/scripts/Dockerfile-ubuntu_21_10 b/scripts/Dockerfile-ubuntu_21_10 index dc0672312a4..faff3c1bd42 100644 --- a/scripts/Dockerfile-ubuntu_21_10 +++ b/scripts/Dockerfile-ubuntu_21_10 @@ -5,29 +5,29 @@ ARG TZ="Europe/London" RUN apt-get update -y && \ apt-get install -y --no-install-recommends \ - build-essential \ - cmake \ - git \ - libavdevice-dev \ - libboost-thread-dev \ - libboost-filesystem-dev \ - libboost-log-dev \ - libcap-dev \ - libdrm-dev \ - libevdev-dev \ - libpulse-dev \ - libopus-dev \ - libssl-dev \ - libwayland-dev \ - libx11-dev \ - libxcb-shm0-dev \ - libxcb-xfixes0-dev \ - libxcb1-dev \ - libxfixes-dev \ - libxrandr-dev \ - libxtst-dev \ - nvidia-cuda-dev \ - nvidia-cuda-toolkit \ + build-essential \ + cmake \ + git \ + libavdevice-dev \ + libboost-thread-dev \ + libboost-filesystem-dev \ + libboost-log-dev \ + libcap-dev \ + libdrm-dev \ + libevdev-dev \ + libpulse-dev \ + libopus-dev \ + libssl-dev \ + libwayland-dev \ + libx11-dev \ + libxcb-shm0-dev \ + libxcb-xfixes0-dev \ + libxcb1-dev \ + libxfixes-dev \ + libxrandr-dev \ + libxtst-dev \ + nvidia-cuda-dev \ + nvidia-cuda-toolkit \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* From c4838424db7dfc651052b52e69f0dfc8dcea842a Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 16:02:13 -0500 Subject: [PATCH 047/106] Remove --no-install-recommends option --- scripts/Dockerfile-debian | 48 +++++++++++++++---------------- scripts/Dockerfile-ubuntu_18_04 | 50 ++++++++++++++++----------------- scripts/Dockerfile-ubuntu_20_04 | 48 +++++++++++++++---------------- scripts/Dockerfile-ubuntu_21_04 | 48 +++++++++++++++---------------- scripts/Dockerfile-ubuntu_21_10 | 48 +++++++++++++++---------------- 5 files changed, 121 insertions(+), 121 deletions(-) diff --git a/scripts/Dockerfile-debian b/scripts/Dockerfile-debian index fbcffd74a6d..15f0d65637b 100644 --- a/scripts/Dockerfile-debian +++ b/scripts/Dockerfile-debian @@ -6,30 +6,30 @@ ARG TZ="Europe/London" SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN echo deb http://deb.debian.org/debian/ bullseye main contrib non-free | tee /etc/apt/sources.list.d/non-free.list RUN apt-get update -y && \ - apt-get install -y --no-install-recommends \ - build-essential \ - cmake \ - git \ - libavdevice-dev \ - libboost-thread-dev \ - libboost-filesystem-dev \ - libboost-log-dev \ - libcap-dev \ - libdrm-dev \ - libevdev-dev \ - libpulse-dev \ - libopus-dev \ - libssl-dev \ - libwayland-dev \ - libx11-dev \ - libxcb-shm0-dev \ - libxcb-xfixes0-dev \ - libxcb1-dev \ - libxfixes-dev \ - libxrandr-dev \ - libxtst-dev \ - nvidia-cuda-dev \ - nvidia-cuda-toolkit \ + apt-get install -y \ + build-essential \ + cmake \ + git \ + libavdevice-dev \ + libboost-thread-dev \ + libboost-filesystem-dev \ + libboost-log-dev \ + libcap-dev \ + libdrm-dev \ + libevdev-dev \ + libpulse-dev \ + libopus-dev \ + libssl-dev \ + libwayland-dev \ + libx11-dev \ + libxcb-shm0-dev \ + libxcb-xfixes0-dev \ + libxcb1-dev \ + libxfixes-dev \ + libxrandr-dev \ + libxtst-dev \ + nvidia-cuda-dev \ + nvidia-cuda-toolkit \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index 2c732eb5022..480589b9ce8 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -7,31 +7,31 @@ RUN apt-get update -y && \ apt-get install -y --no-install-recommends software-properties-common && \ add-apt-repository ppa:ubuntu-toolchain-r/test && \ apt-get update -y && \ - apt-get install -y --no-install-recommends \ - build-essential \ - cmake \ - gcc-10 \ - git \ - g++-10 \ - libavdevice-dev \ - libboost-thread-dev \ - libboost-filesystem-dev \ - libboost-log-dev \ - libcap-dev \ - libdrm-dev \ - libevdev-dev \ - libpulse-dev \ - libopus-dev \ - libssl-dev \ - libwayland-dev \ - libx11-dev \ - libxcb-shm0-dev \ - libxcb-xfixes0-dev \ - libxcb1-dev \ - libxfixes-dev \ - libxrandr-dev \ - libxtst-dev \ - wget \ + apt-get install -y \ + build-essential \ + cmake \ + gcc-10 \ + git \ + g++-10 \ + libavdevice-dev \ + libboost-thread-dev \ + libboost-filesystem-dev \ + libboost-log-dev \ + libcap-dev \ + libdrm-dev \ + libevdev-dev \ + libpulse-dev \ + libopus-dev \ + libssl-dev \ + libwayland-dev \ + libx11-dev \ + libxcb-shm0-dev \ + libxcb-xfixes0-dev \ + libxcb1-dev \ + libxfixes-dev \ + libxrandr-dev \ + libxtst-dev \ + wget \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/scripts/Dockerfile-ubuntu_20_04 b/scripts/Dockerfile-ubuntu_20_04 index 713726a4430..878e0f49a1e 100644 --- a/scripts/Dockerfile-ubuntu_20_04 +++ b/scripts/Dockerfile-ubuntu_20_04 @@ -4,30 +4,30 @@ ARG DEBIAN_FRONTEND=noninteractive ARG TZ="Europe/London" RUN apt-get update -y && \ - apt-get install -y --no-install-recommends \ - build-essential \ - cmake \ - git \ - g++-10 \ - libavdevice-dev \ - libboost-thread-dev \ - libboost-filesystem-dev \ - libboost-log-dev \ - libcap-dev \ - libdrm-dev \ - libevdev-dev \ - libpulse-dev \ - libopus-dev \ - libssl-dev \ - libwayland-dev \ - libx11-dev \ - libxcb-shm0-dev \ - libxcb-xfixes0-dev \ - libxcb1-dev \ - libxfixes-dev \ - libxrandr-dev \ - libxtst-dev \ - wget \ + apt-get install -y \ + build-essential \ + cmake \ + git \ + g++-10 \ + libavdevice-dev \ + libboost-thread-dev \ + libboost-filesystem-dev \ + libboost-log-dev \ + libcap-dev \ + libdrm-dev \ + libevdev-dev \ + libpulse-dev \ + libopus-dev \ + libssl-dev \ + libwayland-dev \ + libx11-dev \ + libxcb-shm0-dev \ + libxcb-xfixes0-dev \ + libxcb1-dev \ + libxfixes-dev \ + libxrandr-dev \ + libxtst-dev \ + wget \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/scripts/Dockerfile-ubuntu_21_04 b/scripts/Dockerfile-ubuntu_21_04 index 6c644d4ecc3..d5668df415a 100644 --- a/scripts/Dockerfile-ubuntu_21_04 +++ b/scripts/Dockerfile-ubuntu_21_04 @@ -4,30 +4,30 @@ ARG DEBIAN_FRONTEND=noninteractive ARG TZ="Europe/London" RUN apt-get update -y && \ - apt-get install -y --no-install-recommends \ - build-essential \ - cmake \ - git \ - libavdevice-dev \ - libboost-thread-dev \ - libboost-filesystem-dev \ - libboost-log-dev \ - libcap-dev \ - libdrm-dev \ - libevdev-dev \ - libpulse-dev \ - libopus-dev \ - libssl-dev \ - libwayland-dev \ - libx11-dev \ - libxcb-shm0-dev \ - libxcb-xfixes0-dev \ - libxcb1-dev \ - libxfixes-dev \ - libxrandr-dev \ - libxtst-dev \ - nvidia-cuda-dev \ - nvidia-cuda-toolkit \ + apt-get install -y \ + build-essential \ + cmake \ + git \ + libavdevice-dev \ + libboost-thread-dev \ + libboost-filesystem-dev \ + libboost-log-dev \ + libcap-dev \ + libdrm-dev \ + libevdev-dev \ + libpulse-dev \ + libopus-dev \ + libssl-dev \ + libwayland-dev \ + libx11-dev \ + libxcb-shm0-dev \ + libxcb-xfixes0-dev \ + libxcb1-dev \ + libxfixes-dev \ + libxrandr-dev \ + libxtst-dev \ + nvidia-cuda-dev \ + nvidia-cuda-toolkit \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/scripts/Dockerfile-ubuntu_21_10 b/scripts/Dockerfile-ubuntu_21_10 index faff3c1bd42..14770625369 100644 --- a/scripts/Dockerfile-ubuntu_21_10 +++ b/scripts/Dockerfile-ubuntu_21_10 @@ -4,30 +4,30 @@ ARG DEBIAN_FRONTEND=noninteractive ARG TZ="Europe/London" RUN apt-get update -y && \ - apt-get install -y --no-install-recommends \ - build-essential \ - cmake \ - git \ - libavdevice-dev \ - libboost-thread-dev \ - libboost-filesystem-dev \ - libboost-log-dev \ - libcap-dev \ - libdrm-dev \ - libevdev-dev \ - libpulse-dev \ - libopus-dev \ - libssl-dev \ - libwayland-dev \ - libx11-dev \ - libxcb-shm0-dev \ - libxcb-xfixes0-dev \ - libxcb1-dev \ - libxfixes-dev \ - libxrandr-dev \ - libxtst-dev \ - nvidia-cuda-dev \ - nvidia-cuda-toolkit \ + apt-get install -y \ + build-essential \ + cmake \ + git \ + libavdevice-dev \ + libboost-thread-dev \ + libboost-filesystem-dev \ + libboost-log-dev \ + libcap-dev \ + libdrm-dev \ + libevdev-dev \ + libpulse-dev \ + libopus-dev \ + libssl-dev \ + libwayland-dev \ + libx11-dev \ + libxcb-shm0-dev \ + libxcb-xfixes0-dev \ + libxcb1-dev \ + libxfixes-dev \ + libxrandr-dev \ + libxtst-dev \ + nvidia-cuda-dev \ + nvidia-cuda-toolkit \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* From 975c4e6b2624734d0ab0f8a295604491e07ce962 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 16:03:08 -0500 Subject: [PATCH 048/106] Install rpmfusion as separate command --- scripts/Dockerfile-fedora_33 | 25 ++++++++++++------------ scripts/Dockerfile-fedora_35 | 37 ++++++++++++++++++------------------ 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/scripts/Dockerfile-fedora_33 b/scripts/Dockerfile-fedora_33 index c0143e8cebe..7dad9f57fba 100644 --- a/scripts/Dockerfile-fedora_33 +++ b/scripts/Dockerfile-fedora_33 @@ -3,18 +3,19 @@ FROM fedora:33 AS sunshine-fedora_33 RUN dnf -y update && \ dnf -y group install "Development Tools" && \ dnf -y 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 && \ - boost-devel \ - boost-static.x86_64 \ - cmake \ - ffmpeg-devel \ - libevdev-devel \ - libxcb-devel \ - libX11-devel \ - libXfixes-devel \ - libXtst-devel \ - openssl-devel \ - opus-devel \ - pulseaudio-libs-devel \ + dnf -y install \ + boost-devel \ + boost-static.x86_64 \ + cmake \ + ffmpeg-devel \ + libevdev-devel \ + libxcb-devel \ + libX11-devel \ + libXfixes-devel \ + libXtst-devel \ + openssl-devel \ + opus-devel \ + pulseaudio-libs-devel \ && dnf clean all \ && rm -rf /var/cache/yum diff --git a/scripts/Dockerfile-fedora_35 b/scripts/Dockerfile-fedora_35 index 2beca2f89da..1b52b5faabf 100644 --- a/scripts/Dockerfile-fedora_35 +++ b/scripts/Dockerfile-fedora_35 @@ -2,24 +2,25 @@ FROM fedora:35 AS sunshine-fedora_35 RUN dnf -y update && \ dnf -y group install "Development Tools" && \ - dnf -y 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 \ - boost-devel \ - boost-static.x86_64 \ - cmake \ - ffmpeg-devel \ - libevdev-devel \ - libxcb-devel \ - libX11-devel \ - libXcursor-devel \ - libXfixes-devel \ - libXinerama-devel \ - libXi-devel \ - libXrandr-devel \ - libXtst-devel \ - mesa-libGL-devel \ - openssl-devel \ - opus-devel \ - pulseaudio-libs-devel \ + dnf -y 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 -y install \ + boost-devel \ + boost-static.x86_64 \ + cmake \ + ffmpeg-devel \ + libevdev-devel \ + libxcb-devel \ + libX11-devel \ + libXcursor-devel \ + libXfixes-devel \ + libXinerama-devel \ + libXi-devel \ + libXrandr-devel \ + libXtst-devel \ + mesa-libGL-devel \ + openssl-devel \ + opus-devel \ + pulseaudio-libs-devel \ && dnf clean all \ && rm -rf /var/cache/yum From 7c96ee1e00697c2eccac6960ebd5fb93364a4e9a Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 16:22:17 -0500 Subject: [PATCH 049/106] Fix cmake -Add repo for updated cmake --- scripts/Dockerfile-ubuntu_18_04 | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index 480589b9ce8..c4701312361 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -6,6 +6,7 @@ ARG TZ="Europe/London" RUN apt-get update -y && \ apt-get install -y --no-install-recommends software-properties-common && \ add-apt-repository ppa:ubuntu-toolchain-r/test && \ + add-apt-repository ppa:george-edison55/cmake-3.x && \ apt-get update -y && \ apt-get install -y \ build-essential \ From 7c6fecf13d04f9bec65ac405b3a044c644fd2538 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 16:46:47 -0500 Subject: [PATCH 050/106] Fix cmake --- scripts/Dockerfile-ubuntu_18_04 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index c4701312361..5e12f4484ab 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -6,11 +6,9 @@ ARG TZ="Europe/London" RUN apt-get update -y && \ apt-get install -y --no-install-recommends software-properties-common && \ add-apt-repository ppa:ubuntu-toolchain-r/test && \ - add-apt-repository ppa:george-edison55/cmake-3.x && \ apt-get update -y && \ apt-get install -y \ build-essential \ - cmake \ gcc-10 \ git \ g++-10 \ @@ -36,6 +34,13 @@ RUN apt-get update -y && \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.1/cmake-3.22.1.tar.gz && \ + tar -zxvf cmake-3.22.1.tar.gz && \ + cd cmake-3.22.1 && \ + ./bootstrap && \ + make && \ + make install + 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 From 75cdac5dbf85118b74d30129a074ce718688258c Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 17:19:01 -0500 Subject: [PATCH 051/106] Update Dockerfile-ubuntu_18_04 -Remove cmake build -Test pipefail --- scripts/Dockerfile-ubuntu_18_04 | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index 5e12f4484ab..4a0982b443a 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -3,12 +3,14 @@ FROM ubuntu:18.04 AS sunshine-ubuntu_18_04 ARG DEBIAN_FRONTEND=noninteractive ARG TZ="Europe/London" +SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN apt-get update -y && \ apt-get install -y --no-install-recommends software-properties-common && \ add-apt-repository ppa:ubuntu-toolchain-r/test && \ apt-get update -y && \ apt-get install -y \ build-essential \ + cmake \ gcc-10 \ git \ g++-10 \ @@ -34,13 +36,6 @@ RUN apt-get update -y && \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.1/cmake-3.22.1.tar.gz && \ - tar -zxvf cmake-3.22.1.tar.gz && \ - cd cmake-3.22.1 && \ - ./bootstrap && \ - make && \ - make install - 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 From 07b974d63842ddf42006fdac0fd4365863de24d7 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 17:47:35 -0500 Subject: [PATCH 052/106] Update Dockerfile-fedora_33 --- scripts/Dockerfile-fedora_33 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/Dockerfile-fedora_33 b/scripts/Dockerfile-fedora_33 index 7dad9f57fba..ae7e49592ec 100644 --- a/scripts/Dockerfile-fedora_33 +++ b/scripts/Dockerfile-fedora_33 @@ -1,5 +1,6 @@ FROM fedora:33 AS sunshine-fedora_33 +SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN dnf -y update && \ dnf -y group install "Development Tools" && \ dnf -y 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 && \ @@ -12,6 +13,7 @@ RUN dnf -y update && \ libxcb-devel \ libX11-devel \ libXfixes-devel \ + libXrandr-devel \ libXtst-devel \ openssl-devel \ opus-devel \ From 26aff26eb05fd5a183b3fd2929463b6ae45b7c52 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 18:03:50 -0500 Subject: [PATCH 053/106] Update Dockerfile-fedora_35 -Add gcc-c++ package --- scripts/Dockerfile-fedora_35 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/Dockerfile-fedora_35 b/scripts/Dockerfile-fedora_35 index 1b52b5faabf..0cde7aa4b09 100644 --- a/scripts/Dockerfile-fedora_35 +++ b/scripts/Dockerfile-fedora_35 @@ -1,5 +1,6 @@ FROM fedora:35 AS sunshine-fedora_35 +SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN dnf -y update && \ dnf -y group install "Development Tools" && \ dnf -y 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 && \ @@ -8,6 +9,7 @@ RUN dnf -y update && \ boost-static.x86_64 \ cmake \ ffmpeg-devel \ + gcc-c++ \ libevdev-devel \ libxcb-devel \ libX11-devel \ From c3eabebd915bd5487803caf296385dc928abc180 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 18:35:02 -0500 Subject: [PATCH 054/106] Update Dockerfile-ubuntu_18_04 -Try different cmake repo --- scripts/Dockerfile-ubuntu_18_04 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index 4a0982b443a..52a896a9c2a 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -5,7 +5,13 @@ ARG TZ="Europe/London" SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN apt-get update -y && \ - apt-get install -y --no-install-recommends software-properties-common && \ + apt-get install -y \ + apt-transport-https \ + ca-certificates \ + gnupg \ + software-properties-common \ + && wget -qO - https://apt.kitware.com/keys/kitware-archive-latest.asc | sudo apt-key add - && \ + add-apt-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && \ add-apt-repository ppa:ubuntu-toolchain-r/test && \ apt-get update -y && \ apt-get install -y \ From 85cd54fdfe47a563bfb6fb3fa4ecf7e9290647d4 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 18:37:52 -0500 Subject: [PATCH 055/106] Update Dockerfile-ubuntu_18_04 -Move wget --- scripts/Dockerfile-ubuntu_18_04 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index 52a896a9c2a..a66dd13414f 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -10,7 +10,8 @@ RUN apt-get update -y && \ ca-certificates \ gnupg \ software-properties-common \ - && wget -qO - https://apt.kitware.com/keys/kitware-archive-latest.asc | sudo apt-key add - && \ + wget \ + && wget -qO - https://apt.kitware.com/keys/kitware-archive-latest.asc | apt-key add - && \ add-apt-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && \ add-apt-repository ppa:ubuntu-toolchain-r/test && \ apt-get update -y && \ @@ -38,7 +39,6 @@ RUN apt-get update -y && \ libxfixes-dev \ libxrandr-dev \ libxtst-dev \ - wget \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* From 83a4440cad6425ff0e75a663eb2221e1b3aa4d2f Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 18:53:16 -0500 Subject: [PATCH 056/106] Update Dockerfile-ubuntu_18_04 -Add libboost-regex-dev --- scripts/Dockerfile-ubuntu_18_04 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index a66dd13414f..bff3432f06b 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -22,9 +22,10 @@ RUN apt-get update -y && \ git \ g++-10 \ libavdevice-dev \ - libboost-thread-dev \ libboost-filesystem-dev \ libboost-log-dev \ + libboost-regex-dev \ + libboost-thread-dev \ libcap-dev \ libdrm-dev \ libevdev-dev \ From 7ce9d27a67cfcb17da2335f6f6c49f81ed558157 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 19:20:20 -0500 Subject: [PATCH 057/106] Update Dockerfile-ubuntu_18_04 -Add ffmpeg --- scripts/Dockerfile-ubuntu_18_04 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index bff3432f06b..7566217405c 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -14,10 +14,14 @@ RUN apt-get update -y && \ && wget -qO - https://apt.kitware.com/keys/kitware-archive-latest.asc | apt-key add - && \ add-apt-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && \ add-apt-repository ppa:ubuntu-toolchain-r/test && \ + add-apt-repository ppa:savoury1/graphics && \ + add-apt-repository ppa:savoury1/multimedia && \ + add-apt-repository ppa:savoury1/ffmpeg4 && \ apt-get update -y && \ apt-get install -y \ build-essential \ cmake \ + ffmpeg \ gcc-10 \ git \ g++-10 \ From 9350afbe6a8690681ee297145df49ce81f026086 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Mon, 20 Dec 2021 15:52:01 -0500 Subject: [PATCH 058/106] Test boost compiled with mingw --- .github/workflows/pull-requests_build-check.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index c62ab5d8e09..c907c94e8cc 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -131,17 +131,19 @@ jobs: submodules: recursive - name: Install boost - uses: MarkusJx/install-boost@v2.0.0 + #uses: MarkusJx/install-boost@v2.0.0 + uses: MarkusJx/install-boost@boost-mingw id: install-boost with: # REQUIRED: Specify the required boost version # A list of supported versions can be found here: # https://github.com/actions/boost-versions/blob/main/versions-manifest.json - boost_version: 1.77.0 + boost_version: 1.78.0 # OPTIONAL: Specify a custom install location boost_install_dir: 'C:' # OPTIONAL: Specify a platform version platform_version: 2019 + toolset: mingw # NOTE: If a boost version matching all requirements cannot be found, # this build step will fail From 8309ee965ae262b723e3ddd21badf8dd305a32a2 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Mon, 20 Dec 2021 17:38:42 -0500 Subject: [PATCH 059/106] Update pull-requests_build-check.yml -Add mingw-w64-libc++ --- .github/workflows/pull-requests_build-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index c907c94e8cc..b6f2205af47 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -149,7 +149,7 @@ jobs: # this build step will fail - name: Setup Windows run: | - C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-binutils mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git yasm nasm diffutils make" + C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-binutils mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost mingw-w64-libc++ git yasm nasm diffutils make" - name: Build Windows env: BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} From 0db8e634a8cf3ee59fb36195dd2d0270f168d552 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Mon, 20 Dec 2021 17:54:13 -0500 Subject: [PATCH 060/106] Update pull-requests_build-check.yml -Fix name of libc++ for windows build --- .github/workflows/pull-requests_build-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index b6f2205af47..5e4aacb2485 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -149,7 +149,7 @@ jobs: # this build step will fail - name: Setup Windows run: | - C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-binutils mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost mingw-w64-libc++ git yasm nasm diffutils make" + C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-binutils mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost mingw-w64-clang-x86_64-libc++ git yasm nasm diffutils make" - name: Build Windows env: BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} From 4a1f5194cc0fccdf01182524f9bd44c8db5c4c83 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Mon, 20 Dec 2021 18:15:16 -0500 Subject: [PATCH 061/106] Update pull-requests_build-check.yml -Remove libc++ -Try setting compiler to c++17 --- .github/workflows/pull-requests_build-check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 5e4aacb2485..47b13d340b5 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -149,7 +149,7 @@ jobs: # this build step will fail - name: Setup Windows run: | - C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-binutils mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost mingw-w64-clang-x86_64-libc++ git yasm nasm diffutils make" + C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-binutils mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git yasm nasm diffutils make" - name: Build Windows env: BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} @@ -159,7 +159,7 @@ jobs: set BOOST_ROOT=C:\boost set BOOST_INCLUDEDIR=C:\boost set BOOST_LIBRARYDIR=C:\boost\lib - cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. + cmake -DCMAKE_CXX_FLAGS=/std:c++17 -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. mingw32-make -j2 - name: Package Windows run: | From c844290c8108fd1dfc826d417f61a6d44f627578 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Mon, 20 Dec 2021 18:26:38 -0500 Subject: [PATCH 062/106] Update pull-requests_build-check.yml --- .github/workflows/pull-requests_build-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 47b13d340b5..b1613413e5f 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -159,7 +159,7 @@ jobs: set BOOST_ROOT=C:\boost set BOOST_INCLUDEDIR=C:\boost set BOOST_LIBRARYDIR=C:\boost\lib - cmake -DCMAKE_CXX_FLAGS=/std:c++17 -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. + cmake -DCMAKE_CXX_STANDARD=17 -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. mingw32-make -j2 - name: Package Windows run: | From 32867d1bbf0557192ab5a780baa0b23f57ae2698 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Mon, 20 Dec 2021 21:15:24 -0500 Subject: [PATCH 063/106] Update pull-requests_build-check.yml -Try Windows build with Unix Makefiles --- .../workflows/pull-requests_build-check.yml | 50 +++++++++++-------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index b1613413e5f..ca99ae20a30 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -130,36 +130,44 @@ jobs: with: submodules: recursive - - name: Install boost - #uses: MarkusJx/install-boost@v2.0.0 - uses: MarkusJx/install-boost@boost-mingw - id: install-boost - with: - # REQUIRED: Specify the required boost version - # A list of supported versions can be found here: - # https://github.com/actions/boost-versions/blob/main/versions-manifest.json - boost_version: 1.78.0 - # OPTIONAL: Specify a custom install location - boost_install_dir: 'C:' - # OPTIONAL: Specify a platform version - platform_version: 2019 - toolset: mingw - - # NOTE: If a boost version matching all requirements cannot be found, - # this build step will fail +# - name: Install boost +# #uses: MarkusJx/install-boost@v2.0.0 +# uses: MarkusJx/install-boost@boost-mingw +# id: install-boost +# with: +# # REQUIRED: Specify the required boost version +# # A list of supported versions can be found here: +# # https://github.com/actions/boost-versions/blob/main/versions-manifest.json +# boost_version: 1.78.0 +# # OPTIONAL: Specify a custom install location +# boost_install_dir: 'C:' +# # OPTIONAL: Specify a platform version +# platform_version: 2019 +# toolset: mingw +# +# # NOTE: If a boost version matching all requirements cannot be found, +# # this build step will fail - name: Setup Windows run: | C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-binutils mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git yasm nasm diffutils make" +# - name: Build Windows +# env: +# BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} +# run: | +# mkdir sunshine-windows-build && cd sunshine-windows-build +# set PATH=C:\msys64\mingw64\bin +# set BOOST_ROOT=C:\boost +# set BOOST_INCLUDEDIR=C:\boost +# set BOOST_LIBRARYDIR=C:\boost\lib +# cmake -DCMAKE_CXX_STANDARD=17 -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. +# mingw32-make -j2 - name: Build Windows env: BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} run: | mkdir sunshine-windows-build && cd sunshine-windows-build set PATH=C:\msys64\mingw64\bin - set BOOST_ROOT=C:\boost - set BOOST_INCLUDEDIR=C:\boost - set BOOST_LIBRARYDIR=C:\boost\lib - cmake -DCMAKE_CXX_STANDARD=17 -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. + cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "Unix Makefiles" .. mingw32-make -j2 - name: Package Windows run: | From bc945df0a7ad311f7772349118ef44df80ce7296 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Mon, 20 Dec 2021 21:31:22 -0500 Subject: [PATCH 064/106] Update pull-requests_build-check.yml --- .github/workflows/pull-requests_build-check.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index ca99ae20a30..1b3f2dcddf8 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -130,6 +130,23 @@ jobs: with: submodules: recursive + - name: Install boost + #uses: MarkusJx/install-boost@v2.0.0 + uses: MarkusJx/install-boost@boost-mingw + id: install-boost + with: + # REQUIRED: Specify the required boost version + # A list of supported versions can be found here: + # https://github.com/actions/boost-versions/blob/main/versions-manifest.json + boost_version: 1.78.0 + # OPTIONAL: Specify a custom install location + boost_install_dir: 'C:' + # OPTIONAL: Specify a platform version + platform_version: 2019 + toolset: msvc + + # NOTE: If a boost version matching all requirements cannot be found, + # this build step will fail # - name: Install boost # #uses: MarkusJx/install-boost@v2.0.0 # uses: MarkusJx/install-boost@boost-mingw From 18a977fdf1eeb6e5097ff209bf6d857b029dcf45 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Mon, 20 Dec 2021 21:38:32 -0500 Subject: [PATCH 065/106] Update pull-requests_build-check.yml --- .../workflows/pull-requests_build-check.yml | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 1b3f2dcddf8..4288b74c014 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -143,27 +143,10 @@ jobs: boost_install_dir: 'C:' # OPTIONAL: Specify a platform version platform_version: 2019 - toolset: msvc + toolset: mingw # NOTE: If a boost version matching all requirements cannot be found, # this build step will fail -# - name: Install boost -# #uses: MarkusJx/install-boost@v2.0.0 -# uses: MarkusJx/install-boost@boost-mingw -# id: install-boost -# with: -# # REQUIRED: Specify the required boost version -# # A list of supported versions can be found here: -# # https://github.com/actions/boost-versions/blob/main/versions-manifest.json -# boost_version: 1.78.0 -# # OPTIONAL: Specify a custom install location -# boost_install_dir: 'C:' -# # OPTIONAL: Specify a platform version -# platform_version: 2019 -# toolset: mingw -# -# # NOTE: If a boost version matching all requirements cannot be found, -# # this build step will fail - name: Setup Windows run: | C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-binutils mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git yasm nasm diffutils make" From cc4ec1b526b85b3777b5c29a590579d709655527 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Mon, 20 Dec 2021 23:00:25 -0500 Subject: [PATCH 066/106] Update Dockerfile-ubuntu_18_04 --- scripts/Dockerfile-ubuntu_18_04 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index 7566217405c..384294600a4 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -22,9 +22,9 @@ RUN apt-get update -y && \ build-essential \ cmake \ ffmpeg \ - gcc-10 \ + gcc-9 \ git \ - g++-10 \ + g++-9 \ libavdevice-dev \ libboost-filesystem-dev \ libboost-log-dev \ @@ -36,6 +36,7 @@ RUN apt-get update -y && \ libpulse-dev \ libopus-dev \ libssl-dev \ + libstdc++-9 \ libwayland-dev \ libx11-dev \ libxcb-shm0-dev \ @@ -47,7 +48,7 @@ RUN apt-get update -y && \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -RUN cp /usr/bin/gcc-10 /usr/bin/gcc && cp /usr/bin/g++-10 /usr/bin/gcc-10 +RUN cp /usr/bin/gcc-9 /usr/bin/gcc && cp /usr/bin/g++-9 /usr/bin/gcc-9 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 From 8f78b599ae1baf09035c4c46f9ec16137c1443be Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Mon, 20 Dec 2021 23:23:26 -0500 Subject: [PATCH 067/106] Use update-alternatives for gcc-10 and g++-10 --- scripts/Dockerfile-ubuntu_18_04 | 7 +++---- scripts/Dockerfile-ubuntu_20_04 | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index 384294600a4..5ee33ae3312 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -22,9 +22,9 @@ RUN apt-get update -y && \ build-essential \ cmake \ ffmpeg \ - gcc-9 \ + gcc-10 \ git \ - g++-9 \ + g++-10 \ libavdevice-dev \ libboost-filesystem-dev \ libboost-log-dev \ @@ -36,7 +36,6 @@ RUN apt-get update -y && \ libpulse-dev \ libopus-dev \ libssl-dev \ - libstdc++-9 \ libwayland-dev \ libx11-dev \ libxcb-shm0-dev \ @@ -48,7 +47,7 @@ RUN apt-get update -y && \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -RUN cp /usr/bin/gcc-9 /usr/bin/gcc && cp /usr/bin/g++-9 /usr/bin/gcc-9 +RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-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 diff --git a/scripts/Dockerfile-ubuntu_20_04 b/scripts/Dockerfile-ubuntu_20_04 index 878e0f49a1e..767757087a7 100644 --- a/scripts/Dockerfile-ubuntu_20_04 +++ b/scripts/Dockerfile-ubuntu_20_04 @@ -31,7 +31,8 @@ RUN apt-get update -y && \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -RUN cp /usr/bin/gcc-10 /usr/bin/gcc && cp /usr/bin/g++-10 /usr/bin/gcc-10 +# RUN cp /usr/bin/gcc-10 /usr/bin/gcc && cp /usr/bin/g++-10 /usr/bin/gcc-10 +RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-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 From 59394e23f41cd3a7924b141fc72af9c5e3764d86 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Mon, 20 Dec 2021 23:43:23 -0500 Subject: [PATCH 068/106] Update Dockerfile-ubuntu_18_04 --- scripts/Dockerfile-ubuntu_18_04 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index 5ee33ae3312..34e075c2e11 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -55,4 +55,4 @@ RUN /root/cuda.run --silent --toolkit --toolkitpath=/usr --no-opengl-libs --no-m COPY build-private.sh /root/build.sh -ENTRYPOINT ["/root/build.sh"] +ENTRYPOINT ["/root/build.sh" -p] From 279fb8803e1cd26c63482d0af4ee46b052ebe535 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Mon, 20 Dec 2021 23:54:46 -0500 Subject: [PATCH 069/106] Update Dockerfile-ubuntu_18_04 --- scripts/Dockerfile-ubuntu_18_04 | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index 34e075c2e11..dfeb039a60a 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -26,10 +26,7 @@ RUN apt-get update -y && \ git \ g++-10 \ libavdevice-dev \ - libboost-filesystem-dev \ - libboost-log-dev \ - libboost-regex-dev \ - libboost-thread-dev \ + libboost-all-dev \ libcap-dev \ libdrm-dev \ libevdev-dev \ @@ -55,4 +52,4 @@ RUN /root/cuda.run --silent --toolkit --toolkitpath=/usr --no-opengl-libs --no-m COPY build-private.sh /root/build.sh -ENTRYPOINT ["/root/build.sh" -p] +ENTRYPOINT ["/root/build.sh"] From aeb72cba0240fcd61449fa68e0164ce86437020c Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 21 Dec 2021 00:07:24 -0500 Subject: [PATCH 070/106] Update Dockerfile-ubuntu_18_04 --- scripts/Dockerfile-ubuntu_18_04 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index dfeb039a60a..5ee33ae3312 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -26,7 +26,10 @@ RUN apt-get update -y && \ git \ g++-10 \ libavdevice-dev \ - libboost-all-dev \ + libboost-filesystem-dev \ + libboost-log-dev \ + libboost-regex-dev \ + libboost-thread-dev \ libcap-dev \ libdrm-dev \ libevdev-dev \ From ea1e6f20a8faedb45095e978cbb44eaed128e491 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 21 Dec 2021 00:07:51 -0500 Subject: [PATCH 071/106] Update Dockerfile-ubuntu_20_04 --- scripts/Dockerfile-ubuntu_20_04 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Dockerfile-ubuntu_20_04 b/scripts/Dockerfile-ubuntu_20_04 index 767757087a7..ca457942e4e 100644 --- a/scripts/Dockerfile-ubuntu_20_04 +++ b/scripts/Dockerfile-ubuntu_20_04 @@ -10,9 +10,9 @@ RUN apt-get update -y && \ git \ g++-10 \ libavdevice-dev \ - libboost-thread-dev \ libboost-filesystem-dev \ libboost-log-dev \ + libboost-thread-dev \ libcap-dev \ libdrm-dev \ libevdev-dev \ From 2fec2bfc51da0be10c87387e6495c65f7d6e6d46 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 21 Dec 2021 17:37:40 -0500 Subject: [PATCH 072/106] Update pull-requests_build-check.yml -Change version for MarkusJx/install-boost --- .github/workflows/pull-requests_build-check.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 4288b74c014..fd8aac4c669 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -131,8 +131,7 @@ jobs: submodules: recursive - name: Install boost - #uses: MarkusJx/install-boost@v2.0.0 - uses: MarkusJx/install-boost@boost-mingw + uses: MarkusJx/install-boost@v2.1.0 id: install-boost with: # REQUIRED: Specify the required boost version From a46a14c6ac21ac407c02b56989d38be096168b21 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 21 Dec 2021 18:08:52 -0500 Subject: [PATCH 073/106] Update Dockerfile-ubuntu_18_04 -Test building glibc 2.31 --- scripts/Dockerfile-ubuntu_18_04 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index 5ee33ae3312..25e5c7a6778 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -52,6 +52,14 @@ RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave / 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 +RUN mkdir glibc-src && cd glibc-src && \ + wget http://ftp.gnu.org/gnu/libc/glibc-2.31.tar.gz && \ + tar -xvzf glibc-2.31.tar.gz && \ + mkdir build && cd build && \ + ../glibc-src/glibc-2.31/configure --prefix=/usr/glibc && \ + make && \ + make install && \ + COPY build-private.sh /root/build.sh From 8c37fa8d8b547a52eb4c0277f6ea6c3934a5700f Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 21 Dec 2021 18:19:38 -0500 Subject: [PATCH 074/106] Update Dockerfile-ubuntu_18_04 --- scripts/Dockerfile-ubuntu_18_04 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index 25e5c7a6778..416a084352c 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -58,7 +58,7 @@ RUN mkdir glibc-src && cd glibc-src && \ mkdir build && cd build && \ ../glibc-src/glibc-2.31/configure --prefix=/usr/glibc && \ make && \ - make install && \ + make install COPY build-private.sh /root/build.sh From b843ab7b97dcc00fc08a5949c4cc5d99ed9d696d Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 21 Dec 2021 18:33:59 -0500 Subject: [PATCH 075/106] Update Dockerfile-ubuntu_18_04 --- scripts/Dockerfile-ubuntu_18_04 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index 416a084352c..5b3b2de0b74 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -56,7 +56,7 @@ RUN mkdir glibc-src && cd glibc-src && \ wget http://ftp.gnu.org/gnu/libc/glibc-2.31.tar.gz && \ tar -xvzf glibc-2.31.tar.gz && \ mkdir build && cd build && \ - ../glibc-src/glibc-2.31/configure --prefix=/usr/glibc && \ + ../glibc-2.31/configure --prefix=/usr/glibc && \ make && \ make install From ee513939aab916264efdbb6bd6c0587fe527e8e0 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 21 Dec 2021 18:51:55 -0500 Subject: [PATCH 076/106] Update Dockerfile-ubuntu_18_04 --- scripts/Dockerfile-ubuntu_18_04 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index 5b3b2de0b74..1f8739915fe 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -52,7 +52,8 @@ RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave / 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 -RUN mkdir glibc-src && cd glibc-src && \ +RUN apt-get install -y gawk bison && \ + mkdir glibc-src && cd glibc-src && \ wget http://ftp.gnu.org/gnu/libc/glibc-2.31.tar.gz && \ tar -xvzf glibc-2.31.tar.gz && \ mkdir build && cd build && \ From 2baed357f2a39540ce84bff79e1049e12751e509 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 21 Dec 2021 19:10:27 -0500 Subject: [PATCH 077/106] Update Dockerfile-ubuntu_18_04 --- scripts/Dockerfile-ubuntu_18_04 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index 1f8739915fe..beb47c36671 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -52,8 +52,13 @@ RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave / 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 -RUN apt-get install -y gawk bison && \ - mkdir glibc-src && cd glibc-src && \ +RUN apt-get update -y && \ + apt-get install -y \ + gawk \ + bison \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* \ + && mkdir glibc-src && cd glibc-src && \ wget http://ftp.gnu.org/gnu/libc/glibc-2.31.tar.gz && \ tar -xvzf glibc-2.31.tar.gz && \ mkdir build && cd build && \ From c910de12ff5ebc77b2fd0ea15a5b8dbbd05f37d8 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 21 Dec 2021 19:34:42 -0500 Subject: [PATCH 078/106] Update Dockerfile-ubuntu_18_04 --- scripts/Dockerfile-ubuntu_18_04 | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index beb47c36671..5ee33ae3312 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -52,20 +52,6 @@ RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave / 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 -RUN apt-get update -y && \ - apt-get install -y \ - gawk \ - bison \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* \ - && mkdir glibc-src && cd glibc-src && \ - wget http://ftp.gnu.org/gnu/libc/glibc-2.31.tar.gz && \ - tar -xvzf glibc-2.31.tar.gz && \ - mkdir build && cd build && \ - ../glibc-2.31/configure --prefix=/usr/glibc && \ - make && \ - make install - COPY build-private.sh /root/build.sh From 41906b6fabbb80829135d2e351f0459875b61604 Mon Sep 17 00:00:00 2001 From: Elia Zammuto Date: Fri, 24 Dec 2021 11:27:40 +0100 Subject: [PATCH 079/106] Use msys2 for Windows Build --- .../workflows/pull-requests_build-check.yml | 52 +++++++------------ 1 file changed, 19 insertions(+), 33 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index fd8aac4c669..1dc15c219b1 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -129,43 +129,29 @@ jobs: uses: actions/checkout@v2 with: submodules: recursive - - - name: Install boost - uses: MarkusJx/install-boost@v2.1.0 - id: install-boost + - name: MSYS2 Setup + uses: msys2/setup-msys2@v2 with: - # REQUIRED: Specify the required boost version - # A list of supported versions can be found here: - # https://github.com/actions/boost-versions/blob/main/versions-manifest.json - boost_version: 1.78.0 - # OPTIONAL: Specify a custom install location - boost_install_dir: 'C:' - # OPTIONAL: Specify a platform version - platform_version: 2019 - toolset: mingw - - # NOTE: If a boost version matching all requirements cannot be found, - # this build step will fail - - name: Setup Windows - run: | - C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-binutils mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git yasm nasm diffutils make" -# - name: Build Windows -# env: -# BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} -# run: | -# mkdir sunshine-windows-build && cd sunshine-windows-build -# set PATH=C:\msys64\mingw64\bin -# set BOOST_ROOT=C:\boost -# set BOOST_INCLUDEDIR=C:\boost -# set BOOST_LIBRARYDIR=C:\boost\lib -# cmake -DCMAKE_CXX_STANDARD=17 -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. -# mingw32-make -j2 + update: true + install: >- + base-devel + git + mingw-w64-x86_64-binutils + mingw-w64-x86_64-openssl + mingw-w64-x86_64-cmake + mingw-w64-x86_64-toolchain + mingw-w64-x86_64-opus + mingw-w64-x86_64-x265 + mingw-w64-x86_64-boost + git + yasm + nasm + diffutils + make - name: Build Windows - env: - BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} + shell: msys2 {0} run: | mkdir sunshine-windows-build && cd sunshine-windows-build - set PATH=C:\msys64\mingw64\bin cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "Unix Makefiles" .. mingw32-make -j2 - name: Package Windows From 997738816d706e12119750d489bea46103df14a5 Mon Sep 17 00:00:00 2001 From: Elia Zammuto Date: Fri, 24 Dec 2021 12:19:28 +0100 Subject: [PATCH 080/106] Update pull-requests_build-check.yml --- .github/workflows/pull-requests_build-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 1dc15c219b1..502c09670f4 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -152,7 +152,7 @@ jobs: shell: msys2 {0} run: | mkdir sunshine-windows-build && cd sunshine-windows-build - cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "Unix Makefiles" .. + cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. mingw32-make -j2 - name: Package Windows run: | From 6d2d3eca18f8c3bcd6a3125dfce05758d0f8783e Mon Sep 17 00:00:00 2001 From: Elia Zammuto Date: Sun, 26 Dec 2021 23:32:34 +0100 Subject: [PATCH 081/106] Manually Imported Upstream PR #296 https://github.com/loki-47-6F-64/sunshine/pull/296 by psyke83 should fix the header issue by compiling --- sunshine/platform/windows/publish.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sunshine/platform/windows/publish.cpp b/sunshine/platform/windows/publish.cpp index d981593da6f..7fdef3fc994 100644 --- a/sunshine/platform/windows/publish.cpp +++ b/sunshine/platform/windows/publish.cpp @@ -25,15 +25,18 @@ using namespace std::literals; #define SV(quote) __SV(quote) extern "C" { +#ifndef __MINGW32__ constexpr auto DNS_REQUEST_PENDING = 9506L; constexpr auto DNS_QUERY_REQUEST_VERSION1 = 0x1; constexpr auto DNS_QUERY_RESULTS_VERSION1 = 0x1; +#endif #define SERVICE_DOMAIN "local" constexpr auto SERVICE_INSTANCE_NAME = SV(SERVICE_NAME "." SERVICE_TYPE "." SERVICE_DOMAIN); constexpr auto SERVICE_TYPE_DOMAIN = SV(SERVICE_TYPE "." SERVICE_DOMAIN); +#ifndef __MINGW32__ typedef struct _DNS_SERVICE_INSTANCE { LPWSTR pszInstanceName; LPWSTR pszHostName; @@ -53,6 +56,7 @@ typedef struct _DNS_SERVICE_INSTANCE { DWORD dwInterfaceIndex; } DNS_SERVICE_INSTANCE, *PDNS_SERVICE_INSTANCE; +#endif typedef VOID WINAPI DNS_SERVICE_REGISTER_COMPLETE( _In_ DWORD Status, @@ -61,6 +65,7 @@ typedef VOID WINAPI DNS_SERVICE_REGISTER_COMPLETE( typedef DNS_SERVICE_REGISTER_COMPLETE *PDNS_SERVICE_REGISTER_COMPLETE; +#ifndef __MINGW32__ typedef struct _DNS_SERVICE_CANCEL { PVOID reserved; } DNS_SERVICE_CANCEL, *PDNS_SERVICE_CANCEL; @@ -74,6 +79,7 @@ typedef struct _DNS_SERVICE_REGISTER_REQUEST { HANDLE hCredentials; BOOL unicastEnabled; } DNS_SERVICE_REGISTER_REQUEST, *PDNS_SERVICE_REGISTER_REQUEST; +#endif _FN(_DnsServiceFreeInstance, VOID, (_In_ PDNS_SERVICE_INSTANCE pInstance)); _FN(_DnsServiceDeRegister, DWORD, (_In_ PDNS_SERVICE_REGISTER_REQUEST pRequest, _Inout_opt_ PDNS_SERVICE_CANCEL pCancel)); @@ -186,4 +192,4 @@ std::unique_ptr<::platf::deinit_t> start() { return std::make_unique(); } -} // namespace platf::publish \ No newline at end of file +} // namespace platf::publish From f6fd1f7e8480ad91881cc782f5045503c2fd2445 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Mon, 10 Jan 2022 21:11:44 -0500 Subject: [PATCH 082/106] Update and rename create_package.yml -Create release on push to master (fails if changelog version matches latest release) -Move windows package to artifacts folder -Use re-usable workflow create_release.yml --- ...sts_build-check.yml => create_package.yml} | 26 ++++++++++++++++--- scripts/Dockerfile-ubuntu_20_04 | 1 - 2 files changed, 22 insertions(+), 5 deletions(-) rename .github/workflows/{pull-requests_build-check.yml => create_package.yml} (89%) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/create_package.yml similarity index 89% rename from .github/workflows/pull-requests_build-check.yml rename to .github/workflows/create_package.yml index 502c09670f4..97cad4bd144 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/create_package.yml @@ -1,9 +1,11 @@ -name: Build test +name: Create Package on: pull_request: branches: [master, nightly] types: [opened, synchronize, edited, reopened] + push: + branches: [ master ] workflow_dispatch: jobs: @@ -24,7 +26,7 @@ jobs: sudo apt-get update -y && \ sudo apt-get --reinstall 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 - sudo cp /usr/bin/gcc-10 /usr/bin/gcc && sudo cp /usr/bin/g++-10 /usr/bin/gcc-10 + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 sudo 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 && sudo chmod a+x /root/cuda.run sudo /root/cuda.run --silent --toolkit --toolkitpath=/usr --no-opengl-libs --no-man-page --no-drm && sudo rm /root/cuda.run sudo add-apt-repository ppa:savoury1/graphics -y @@ -84,6 +86,11 @@ jobs: with: name: sunshine-AppImage path: artifacts/ + - name: Create Release + uses: .github/workflows/create_release.yml + secrets: + token: ${{ secrets.GITHUB_TOKEN }} + build_linux: name: Linux @@ -119,6 +126,10 @@ jobs: with: name: sunshine-${{ matrix.distro }} path: artifacts/ + - name: Create Release + uses: .github/workflows/create_release.yml + secrets: + token: ${{ secrets.GITHUB_TOKEN }} build_win: name: Windows @@ -165,9 +176,16 @@ jobs: 7z a Sunshine-Windows.zip tools\sunshinesvc.exe 7z a Sunshine-Windows.zip ..\tools\install-service.bat 7z a Sunshine-Windows.zip ..\tools\uninstall-service.bat + cd .. + mkdir artifacts + move "sunshine-windows-build/Sunshine-Windows.zip" "artifats" - name: Upload Artifacts if: ${{ github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }} uses: actions/upload-artifact@v2 with: - name: Windows - path: sunshine-windows-build/Sunshine-Windows.zip + name: sunshine-${{ runner.os }} + path: artifacts/ + - name: Create Release + uses: .github/workflows/create_release.yml + secrets: + token: ${{ secrets.GITHUB_TOKEN }} diff --git a/scripts/Dockerfile-ubuntu_20_04 b/scripts/Dockerfile-ubuntu_20_04 index ca457942e4e..5a633a10d6b 100644 --- a/scripts/Dockerfile-ubuntu_20_04 +++ b/scripts/Dockerfile-ubuntu_20_04 @@ -31,7 +31,6 @@ RUN apt-get update -y && \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -# RUN cp /usr/bin/gcc-10 /usr/bin/gcc && cp /usr/bin/g++-10 /usr/bin/gcc-10 RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-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 From 65fdf8f6d19033ea6e03fca4615923e35221ac0a Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Mon, 10 Jan 2022 21:11:58 -0500 Subject: [PATCH 083/106] Create create_release.yml --- .github/workflows/create_release.yml | 44 ++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .github/workflows/create_release.yml diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml new file mode 100644 index 00000000000..e0c51484880 --- /dev/null +++ b/.github/workflows/create_release.yml @@ -0,0 +1,44 @@ +name: Create Release + +on: + workflow_call: + secrets: + token: + required: true + +jobs: + create_release: + runs-on: ubuntu-latest + steps: + - name: Parse Changelog Entry + if: ${{ github.ref == 'refs/heads/master' }} + id: changelog + uses: coditory/changelog-parser@v1 # https://github.com/coditory/changelog-parser + + - name: Get last release + if: ${{ github.ref == 'refs/heads/master' }} + id: last_release + uses: InsonusK/get-latest-release@v1.0.1 # https://github.com/InsonusK/get-latest-release + with: + myToken: ${{ secrets.token }} + exclude_types: "draft|prerelease" + view_top: 1 + + - name: Changelog Version + if: ${{ github.ref == 'refs/heads/master' && ( steps.changelog.outputs.version == steps.last_release.tag_name ) }} + # fail the workflow because the versions match + run: | + echo Changelog Version: "${{ steps.changelog.outputs.version }}" + echo Last Released Version: "${{ steps.last_release.tag_name }}" + exit 1 + + - name: Create/Update GitHub Release + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} + uses: ncipollo/release-action@v1 # https://github.com/ncipollo/release-action + with: + name: Release ${{ steps.changelog.outputs.version }} + tag: ${{ steps.changelog.outputs.version }} + artifacts: "./artifacts/*" + token: ${{ secrets.token }} + allowUpdated: true + body: ${{ steps.changelog.outputs.description }} From c579f638fcbb824fb2e5fda34982ae478ffae0c0 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Mon, 10 Jan 2022 21:12:04 -0500 Subject: [PATCH 084/106] Create CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000000..314ecf81982 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,7 @@ +# Changelog + +## [Unreleased] - 2022-01-10 +### Added +-Added something +### Changed +-Fixed something From a97c88c45b1e2d5fffecc5c17de5f7661f39e8f7 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Mon, 10 Jan 2022 21:15:34 -0500 Subject: [PATCH 085/106] Update create_package.yml -Fix typo in uses path --- .github/workflows/create_package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create_package.yml b/.github/workflows/create_package.yml index 97cad4bd144..ea39634ba4b 100644 --- a/.github/workflows/create_package.yml +++ b/.github/workflows/create_package.yml @@ -87,7 +87,7 @@ jobs: name: sunshine-AppImage path: artifacts/ - name: Create Release - uses: .github/workflows/create_release.yml + uses: ./.github/workflows/create_release.yml secrets: token: ${{ secrets.GITHUB_TOKEN }} @@ -127,7 +127,7 @@ jobs: name: sunshine-${{ matrix.distro }} path: artifacts/ - name: Create Release - uses: .github/workflows/create_release.yml + uses: ./.github/workflows/create_release.yml secrets: token: ${{ secrets.GITHUB_TOKEN }} @@ -186,6 +186,6 @@ jobs: name: sunshine-${{ runner.os }} path: artifacts/ - name: Create Release - uses: .github/workflows/create_release.yml + uses: ./.github/workflows/create_release.yml secrets: token: ${{ secrets.GITHUB_TOKEN }} From 4fa26244956ebb8dae84bac53bcaf9b0fb48fb98 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Mon, 10 Jan 2022 21:17:20 -0500 Subject: [PATCH 086/106] Update create_package.yml -Initialize workflow --- .github/workflows/create_package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_package.yml b/.github/workflows/create_package.yml index ea39634ba4b..e02abf98173 100644 --- a/.github/workflows/create_package.yml +++ b/.github/workflows/create_package.yml @@ -5,7 +5,7 @@ on: branches: [master, nightly] types: [opened, synchronize, edited, reopened] push: - branches: [ master ] + branches: [master, add-build-checks] workflow_dispatch: jobs: From 909e36b80d10a9b109bb904238a334d828de4e47 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Mon, 10 Jan 2022 21:20:36 -0500 Subject: [PATCH 087/106] Update create_package.yml -Use with instead of secrets on caller workflow --- .github/workflows/create_package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create_package.yml b/.github/workflows/create_package.yml index e02abf98173..94922e4bdc4 100644 --- a/.github/workflows/create_package.yml +++ b/.github/workflows/create_package.yml @@ -88,7 +88,7 @@ jobs: path: artifacts/ - name: Create Release uses: ./.github/workflows/create_release.yml - secrets: + with: token: ${{ secrets.GITHUB_TOKEN }} @@ -128,7 +128,7 @@ jobs: path: artifacts/ - name: Create Release uses: ./.github/workflows/create_release.yml - secrets: + with: token: ${{ secrets.GITHUB_TOKEN }} build_win: @@ -187,5 +187,5 @@ jobs: path: artifacts/ - name: Create Release uses: ./.github/workflows/create_release.yml - secrets: + with: token: ${{ secrets.GITHUB_TOKEN }} From c2027a5481f3eb6b6b006b19a9e9740c836c7f85 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Mon, 10 Jan 2022 21:46:12 -0500 Subject: [PATCH 088/106] Remove token The documentation states "The called workflow is automatically granted access to `github.token` and `secrets.GITHUB_TOKEN`." --- .github/workflows/create_package.yml | 6 ------ .github/workflows/create_release.yml | 7 ++----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/create_package.yml b/.github/workflows/create_package.yml index 94922e4bdc4..77b40cb1da0 100644 --- a/.github/workflows/create_package.yml +++ b/.github/workflows/create_package.yml @@ -88,8 +88,6 @@ jobs: path: artifacts/ - name: Create Release uses: ./.github/workflows/create_release.yml - with: - token: ${{ secrets.GITHUB_TOKEN }} build_linux: @@ -128,8 +126,6 @@ jobs: path: artifacts/ - name: Create Release uses: ./.github/workflows/create_release.yml - with: - token: ${{ secrets.GITHUB_TOKEN }} build_win: name: Windows @@ -187,5 +183,3 @@ jobs: path: artifacts/ - name: Create Release uses: ./.github/workflows/create_release.yml - with: - token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index e0c51484880..c95a689fcab 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -2,9 +2,6 @@ name: Create Release on: workflow_call: - secrets: - token: - required: true jobs: create_release: @@ -20,7 +17,7 @@ jobs: id: last_release uses: InsonusK/get-latest-release@v1.0.1 # https://github.com/InsonusK/get-latest-release with: - myToken: ${{ secrets.token }} + myToken: ${{ secrets.GITHUB_TOKEN }} exclude_types: "draft|prerelease" view_top: 1 @@ -39,6 +36,6 @@ jobs: name: Release ${{ steps.changelog.outputs.version }} tag: ${{ steps.changelog.outputs.version }} artifacts: "./artifacts/*" - token: ${{ secrets.token }} + token: ${{ secrets.GITHUB_TOKEN }} allowUpdated: true body: ${{ steps.changelog.outputs.description }} From aa3137c0a9a3c738cb8419b66b32dd6ad2214c65 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 11 Jan 2022 00:04:13 -0500 Subject: [PATCH 089/106] Update create_package.yml -Replace create_release.yml with common create_release action --- .github/workflows/create_package.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create_package.yml b/.github/workflows/create_package.yml index 77b40cb1da0..f38a11e3d15 100644 --- a/.github/workflows/create_package.yml +++ b/.github/workflows/create_package.yml @@ -87,7 +87,9 @@ jobs: name: sunshine-AppImage path: artifacts/ - name: Create Release - uses: ./.github/workflows/create_release.yml + uses: SunshineStream/.github/actions/create_release + with: + token: ${{ secrets.GITHUB_TOKEN }} build_linux: @@ -125,7 +127,9 @@ jobs: name: sunshine-${{ matrix.distro }} path: artifacts/ - name: Create Release - uses: ./.github/workflows/create_release.yml + uses: SunshineStream/.github/actions/create_release + with: + token: ${{ secrets.GITHUB_TOKEN }} build_win: name: Windows @@ -182,4 +186,6 @@ jobs: name: sunshine-${{ runner.os }} path: artifacts/ - name: Create Release - uses: ./.github/workflows/create_release.yml + uses: SunshineStream/.github/actions/create_release + with: + token: ${{ secrets.GITHUB_TOKEN }} From 7bfbdd5bc0d059cf6bc4bf9838daa8dac3f33022 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 11 Jan 2022 00:12:54 -0500 Subject: [PATCH 090/106] Update create_package.yml --- .github/workflows/create_package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create_package.yml b/.github/workflows/create_package.yml index f38a11e3d15..0c307dde11d 100644 --- a/.github/workflows/create_package.yml +++ b/.github/workflows/create_package.yml @@ -87,7 +87,7 @@ jobs: name: sunshine-AppImage path: artifacts/ - name: Create Release - uses: SunshineStream/.github/actions/create_release + uses: SunshineStream/actions/create_release with: token: ${{ secrets.GITHUB_TOKEN }} @@ -127,7 +127,7 @@ jobs: name: sunshine-${{ matrix.distro }} path: artifacts/ - name: Create Release - uses: SunshineStream/.github/actions/create_release + uses: SunshineStream/actions/create_release with: token: ${{ secrets.GITHUB_TOKEN }} @@ -186,6 +186,6 @@ jobs: name: sunshine-${{ runner.os }} path: artifacts/ - name: Create Release - uses: SunshineStream/.github/actions/create_release + uses: SunshineStream/actions/create_release with: token: ${{ secrets.GITHUB_TOKEN }} From 51b7dc5b5c00691bc2d46858353805755e8fd362 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 11 Jan 2022 00:14:49 -0500 Subject: [PATCH 091/106] Update create_package.yml --- .github/workflows/create_package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create_package.yml b/.github/workflows/create_package.yml index 0c307dde11d..9e73b9c7c7d 100644 --- a/.github/workflows/create_package.yml +++ b/.github/workflows/create_package.yml @@ -87,7 +87,7 @@ jobs: name: sunshine-AppImage path: artifacts/ - name: Create Release - uses: SunshineStream/actions/create_release + uses: SunshineStream/actions/create_release@v0 with: token: ${{ secrets.GITHUB_TOKEN }} @@ -127,7 +127,7 @@ jobs: name: sunshine-${{ matrix.distro }} path: artifacts/ - name: Create Release - uses: SunshineStream/actions/create_release + uses: SunshineStream/actions/create_release@v0 with: token: ${{ secrets.GITHUB_TOKEN }} @@ -186,6 +186,6 @@ jobs: name: sunshine-${{ runner.os }} path: artifacts/ - name: Create Release - uses: SunshineStream/actions/create_release + uses: SunshineStream/actions/create_release@v0 with: token: ${{ secrets.GITHUB_TOKEN }} From 5dfd5d8027858e6ac37957df266d08eaef108877 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 11 Jan 2022 00:46:47 -0500 Subject: [PATCH 092/106] set -e Github not respecting -e in shebang --- scripts/build-container.sh | 3 ++- scripts/build-private.sh | 1 + scripts/build-sunshine.sh | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/build-container.sh b/scripts/build-container.sh index 69a8c99a4f7..5da4784aef2 100755 --- a/scripts/build-container.sh +++ b/scripts/build-container.sh @@ -1,4 +1,5 @@ -#/bin/bash -e +#!/bin/bash -e +set -e usage() { echo "Usage: $0 [OPTIONS]" diff --git a/scripts/build-private.sh b/scripts/build-private.sh index 1526a754bd2..ade64829088 100755 --- a/scripts/build-private.sh +++ b/scripts/build-private.sh @@ -1,4 +1,5 @@ #!/bin/bash -e +set -e CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Release}" SUNSHINE_EXECUTABLE_PATH="${SUNSHINE_EXECUTABLE_PATH:-/usr/bin/sunshine}" diff --git a/scripts/build-sunshine.sh b/scripts/build-sunshine.sh index b49114bbf73..e8df86cd955 100755 --- a/scripts/build-sunshine.sh +++ b/scripts/build-sunshine.sh @@ -1,4 +1,5 @@ -#/bin/bash -e +#!/bin/bash -e +set -e usage() { echo "Usage: $0" From b1030b6601b7b7de45f9cd40b00b97272f29c3c9 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 11 Jan 2022 01:13:29 -0500 Subject: [PATCH 093/106] Move gen-deb to Dockerfiles --- scripts/Dockerfile-debian | 2 ++ scripts/Dockerfile-ubuntu_18_04 | 2 ++ scripts/Dockerfile-ubuntu_20_04 | 2 ++ scripts/Dockerfile-ubuntu_21_04 | 2 ++ scripts/Dockerfile-ubuntu_21_10 | 2 ++ scripts/build-private.sh | 2 -- 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/Dockerfile-debian b/scripts/Dockerfile-debian index 15f0d65637b..1ed73c5f0ff 100644 --- a/scripts/Dockerfile-debian +++ b/scripts/Dockerfile-debian @@ -37,3 +37,5 @@ COPY build-private.sh /root/build.sh ENTRYPOINT ["/root/build.sh"] + +ENTRYPOINT ["/root/sunshine-build/gen-deb"] diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index 5ee33ae3312..dad4c96bb3c 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -56,3 +56,5 @@ COPY build-private.sh /root/build.sh ENTRYPOINT ["/root/build.sh"] + +ENTRYPOINT ["/root/sunshine-build/gen-deb"] diff --git a/scripts/Dockerfile-ubuntu_20_04 b/scripts/Dockerfile-ubuntu_20_04 index 5a633a10d6b..689c820ca50 100644 --- a/scripts/Dockerfile-ubuntu_20_04 +++ b/scripts/Dockerfile-ubuntu_20_04 @@ -40,3 +40,5 @@ COPY build-private.sh /root/build.sh ENTRYPOINT ["/root/build.sh"] + +ENTRYPOINT ["/root/sunshine-build/gen-deb"] diff --git a/scripts/Dockerfile-ubuntu_21_04 b/scripts/Dockerfile-ubuntu_21_04 index d5668df415a..4beedac6946 100644 --- a/scripts/Dockerfile-ubuntu_21_04 +++ b/scripts/Dockerfile-ubuntu_21_04 @@ -35,3 +35,5 @@ COPY build-private.sh /root/build.sh ENTRYPOINT ["/root/build.sh"] + +ENTRYPOINT ["/root/sunshine-build/gen-deb"] diff --git a/scripts/Dockerfile-ubuntu_21_10 b/scripts/Dockerfile-ubuntu_21_10 index 14770625369..113d4f7090a 100644 --- a/scripts/Dockerfile-ubuntu_21_10 +++ b/scripts/Dockerfile-ubuntu_21_10 @@ -35,3 +35,5 @@ COPY build-private.sh /root/build.sh ENTRYPOINT ["/root/build.sh"] + +ENTRYPOINT ["/root/sunshine-build/gen-deb"] diff --git a/scripts/build-private.sh b/scripts/build-private.sh index ade64829088..283aeffe873 100755 --- a/scripts/build-private.sh +++ b/scripts/build-private.sh @@ -31,5 +31,3 @@ cd /root/sunshine-build cmake "-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE" "-DSUNSHINE_EXECUTABLE_PATH=$SUNSHINE_EXECUTABLE_PATH" "-DSUNSHINE_ASSETS_DIR=$SUNSHINE_ASSETS_DIR" "-DSUNSHINE_ENABLE_WAYLAND=$SUNSHINE_ENABLE_WAYLAND" "-DSUNSHINE_ENABLE_X11=$SUNSHINE_ENABLE_X11" "-DSUNSHINE_ENABLE_DRM=$SUNSHINE_ENABLE_DRM" "-DSUNSHINE_ENABLE_CUDA=$SUNSHINE_ENABLE_CUDA" "$SUNSHINE_ROOT" make -j ${nproc} - -./gen-deb From 41a30b58269ec7b53cc578396e817cc32118f938 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 11 Jan 2022 01:13:57 -0500 Subject: [PATCH 094/106] Skip packaging/release for Fedora build --- .github/workflows/create_package.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create_package.yml b/.github/workflows/create_package.yml index 9e73b9c7c7d..1a98d11b2c2 100644 --- a/.github/workflows/create_package.yml +++ b/.github/workflows/create_package.yml @@ -117,16 +117,18 @@ jobs: cd scripts sudo ./build-sunshine.sh -p -u -n sunshine-${{ matrix.distro }} -s .. - name: Package Linux + if: ${{ matrix.distro != 'fedora_33' && matrix.distro != 'fedore_35' }} run: | cd scripts sudo mv ./sunshine-${{ matrix.distro }}-build/sunshine-${{ matrix.distro }}.deb ../artifacts/ - name: Upload Artifacts - if: ${{ github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }} + if: ${{ ( matrix.distro != 'fedora_33' && matrix.distro != 'fedore_35' ) && ( github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' ) }} uses: actions/upload-artifact@v2 with: name: sunshine-${{ matrix.distro }} path: artifacts/ - name: Create Release + if: ${{ ( matrix.distro != 'fedora_33' && matrix.distro != 'fedore_35' ) && ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) }} uses: SunshineStream/actions/create_release@v0 with: token: ${{ secrets.GITHUB_TOKEN }} From 95a478e55ecfeabe579cf9c73223cf1566c1448a Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 11 Jan 2022 09:45:23 -0500 Subject: [PATCH 095/106] Revert changes --- scripts/Dockerfile-ubuntu_18_04 | 2 -- scripts/Dockerfile-ubuntu_20_04 | 2 -- scripts/Dockerfile-ubuntu_21_10 | 2 -- scripts/build-private.sh | 2 ++ 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index dad4c96bb3c..5ee33ae3312 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -56,5 +56,3 @@ COPY build-private.sh /root/build.sh ENTRYPOINT ["/root/build.sh"] - -ENTRYPOINT ["/root/sunshine-build/gen-deb"] diff --git a/scripts/Dockerfile-ubuntu_20_04 b/scripts/Dockerfile-ubuntu_20_04 index 689c820ca50..5a633a10d6b 100644 --- a/scripts/Dockerfile-ubuntu_20_04 +++ b/scripts/Dockerfile-ubuntu_20_04 @@ -40,5 +40,3 @@ COPY build-private.sh /root/build.sh ENTRYPOINT ["/root/build.sh"] - -ENTRYPOINT ["/root/sunshine-build/gen-deb"] diff --git a/scripts/Dockerfile-ubuntu_21_10 b/scripts/Dockerfile-ubuntu_21_10 index 113d4f7090a..14770625369 100644 --- a/scripts/Dockerfile-ubuntu_21_10 +++ b/scripts/Dockerfile-ubuntu_21_10 @@ -35,5 +35,3 @@ COPY build-private.sh /root/build.sh ENTRYPOINT ["/root/build.sh"] - -ENTRYPOINT ["/root/sunshine-build/gen-deb"] diff --git a/scripts/build-private.sh b/scripts/build-private.sh index 283aeffe873..ade64829088 100755 --- a/scripts/build-private.sh +++ b/scripts/build-private.sh @@ -31,3 +31,5 @@ cd /root/sunshine-build cmake "-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE" "-DSUNSHINE_EXECUTABLE_PATH=$SUNSHINE_EXECUTABLE_PATH" "-DSUNSHINE_ASSETS_DIR=$SUNSHINE_ASSETS_DIR" "-DSUNSHINE_ENABLE_WAYLAND=$SUNSHINE_ENABLE_WAYLAND" "-DSUNSHINE_ENABLE_X11=$SUNSHINE_ENABLE_X11" "-DSUNSHINE_ENABLE_DRM=$SUNSHINE_ENABLE_DRM" "-DSUNSHINE_ENABLE_CUDA=$SUNSHINE_ENABLE_CUDA" "$SUNSHINE_ROOT" make -j ${nproc} + +./gen-deb From 0cad1bf6a5f982c2d9770cf89da74e204b21e113 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 11 Jan 2022 09:45:45 -0500 Subject: [PATCH 096/106] Revert changes --- scripts/Dockerfile-debian | 2 -- scripts/Dockerfile-ubuntu_21_04 | 2 -- 2 files changed, 4 deletions(-) diff --git a/scripts/Dockerfile-debian b/scripts/Dockerfile-debian index 1ed73c5f0ff..15f0d65637b 100644 --- a/scripts/Dockerfile-debian +++ b/scripts/Dockerfile-debian @@ -37,5 +37,3 @@ COPY build-private.sh /root/build.sh ENTRYPOINT ["/root/build.sh"] - -ENTRYPOINT ["/root/sunshine-build/gen-deb"] diff --git a/scripts/Dockerfile-ubuntu_21_04 b/scripts/Dockerfile-ubuntu_21_04 index 4beedac6946..d5668df415a 100644 --- a/scripts/Dockerfile-ubuntu_21_04 +++ b/scripts/Dockerfile-ubuntu_21_04 @@ -35,5 +35,3 @@ COPY build-private.sh /root/build.sh ENTRYPOINT ["/root/build.sh"] - -ENTRYPOINT ["/root/sunshine-build/gen-deb"] From 4c6a0cdc377c6b1a03a9acff87bcd1144804ede7 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 11 Jan 2022 09:46:18 -0500 Subject: [PATCH 097/106] Package based on strategy matrix --- .github/workflows/create_package.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/create_package.yml b/.github/workflows/create_package.yml index 1a98d11b2c2..6829ce603de 100644 --- a/.github/workflows/create_package.yml +++ b/.github/workflows/create_package.yml @@ -98,7 +98,13 @@ jobs: strategy: fail-fast: false matrix: - distro: [ debian, fedora_33, fedora_35, ubuntu_18_04, ubuntu_20_04, ubuntu_21_04, ubuntu_21_10 ] + distro: [ debian, ubuntu_18_04, ubuntu_20_04, ubuntu_21_04, ubuntu_21_10 ] + package: [ -p ] + include: + - distro: fedora_33 + package: '' + - distro: fedora_35 + package: '' steps: - name: Checkout @@ -115,20 +121,20 @@ jobs: - name: Build Linux run: | cd scripts - sudo ./build-sunshine.sh -p -u -n sunshine-${{ matrix.distro }} -s .. + sudo ./build-sunshine.sh ${{ matrix.package }} -u -n sunshine-${{ matrix.distro }} -s .. - name: Package Linux - if: ${{ matrix.distro != 'fedora_33' && matrix.distro != 'fedore_35' }} + if: ${{ matrix.package == '-p' }} run: | cd scripts sudo mv ./sunshine-${{ matrix.distro }}-build/sunshine-${{ matrix.distro }}.deb ../artifacts/ - name: Upload Artifacts - if: ${{ ( matrix.distro != 'fedora_33' && matrix.distro != 'fedore_35' ) && ( github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' ) }} + if: ${{ matrix.package == '-p' && ( github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' ) }} uses: actions/upload-artifact@v2 with: name: sunshine-${{ matrix.distro }} path: artifacts/ - name: Create Release - if: ${{ ( matrix.distro != 'fedora_33' && matrix.distro != 'fedore_35' ) && ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) }} + if: ${{ matrix.package == '-p' && github.event_name == 'push' && github.ref == 'refs/heads/master' }} uses: SunshineStream/actions/create_release@v0 with: token: ${{ secrets.GITHUB_TOKEN }} From 8f99d6cf01b6ad2ecf3b99b6c50270f07445ae47 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 11 Jan 2022 10:01:20 -0500 Subject: [PATCH 098/106] Delete create_release.yml --- .github/workflows/create_release.yml | 41 ---------------------------- 1 file changed, 41 deletions(-) delete mode 100644 .github/workflows/create_release.yml diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml deleted file mode 100644 index c95a689fcab..00000000000 --- a/.github/workflows/create_release.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Create Release - -on: - workflow_call: - -jobs: - create_release: - runs-on: ubuntu-latest - steps: - - name: Parse Changelog Entry - if: ${{ github.ref == 'refs/heads/master' }} - id: changelog - uses: coditory/changelog-parser@v1 # https://github.com/coditory/changelog-parser - - - name: Get last release - if: ${{ github.ref == 'refs/heads/master' }} - id: last_release - uses: InsonusK/get-latest-release@v1.0.1 # https://github.com/InsonusK/get-latest-release - with: - myToken: ${{ secrets.GITHUB_TOKEN }} - exclude_types: "draft|prerelease" - view_top: 1 - - - name: Changelog Version - if: ${{ github.ref == 'refs/heads/master' && ( steps.changelog.outputs.version == steps.last_release.tag_name ) }} - # fail the workflow because the versions match - run: | - echo Changelog Version: "${{ steps.changelog.outputs.version }}" - echo Last Released Version: "${{ steps.last_release.tag_name }}" - exit 1 - - - name: Create/Update GitHub Release - if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} - uses: ncipollo/release-action@v1 # https://github.com/ncipollo/release-action - with: - name: Release ${{ steps.changelog.outputs.version }} - tag: ${{ steps.changelog.outputs.version }} - artifacts: "./artifacts/*" - token: ${{ secrets.GITHUB_TOKEN }} - allowUpdated: true - body: ${{ steps.changelog.outputs.description }} From 60d63fcd2178c28d310cab935ad04f064db29deb Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 11 Jan 2022 10:01:43 -0500 Subject: [PATCH 099/106] Update create_package.yml -Remove push event for add-build-checks --- .github/workflows/create_package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_package.yml b/.github/workflows/create_package.yml index 6829ce603de..1d7f4a26cc4 100644 --- a/.github/workflows/create_package.yml +++ b/.github/workflows/create_package.yml @@ -5,7 +5,7 @@ on: branches: [master, nightly] types: [opened, synchronize, edited, reopened] push: - branches: [master, add-build-checks] + branches: [master] workflow_dispatch: jobs: From c5d782dac559e6af9a9baf45afe5de093556b599 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 11 Jan 2022 10:18:52 -0500 Subject: [PATCH 100/106] Remove Ubuntu 18.04 from strategy --- .github/workflows/create_package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create_package.yml b/.github/workflows/create_package.yml index 1d7f4a26cc4..bf1d4dbb625 100644 --- a/.github/workflows/create_package.yml +++ b/.github/workflows/create_package.yml @@ -96,11 +96,11 @@ jobs: name: Linux runs-on: ubuntu-20.04 strategy: - fail-fast: false + fail-fast: true # false to test all, true to fail entire job if any fail matrix: - distro: [ debian, ubuntu_18_04, ubuntu_20_04, ubuntu_21_04, ubuntu_21_10 ] + distro: [ debian, ubuntu_20_04, ubuntu_21_04, ubuntu_21_10 ] # removed ubuntu_18_04 for now package: [ -p ] - include: + include: # don't package these - distro: fedora_33 package: '' - distro: fedora_35 From bfda8558ea1425b4af6ef4ddd2d25d1cd2437128 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 11 Jan 2022 10:39:20 -0500 Subject: [PATCH 101/106] Update CHANGELOG.md --- CHANGELOG.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 314ecf81982..2a052870d7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,12 @@ # Changelog -## [Unreleased] - 2022-01-10 +## [0.0.0] - 2022-01-11 ### Added --Added something +-Github Pull Request Tests +-Github Automated Release +-Github Issue Template +-Github Pull Request Template +-AppImage packaging during PR Test and Release +-Fedora build test during PR Test and Release (no package available yet) ### Changed --Fixed something +-Renamed Dockerfiles From cefcaed3580f40d690a22a05dc69606b9976aa1a Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 11 Jan 2022 17:40:58 -0500 Subject: [PATCH 102/106] Update create_package.yml --- .github/workflows/create_package.yml | 29 ++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/.github/workflows/create_package.yml b/.github/workflows/create_package.yml index bf1d4dbb625..d6d43916fca 100644 --- a/.github/workflows/create_package.yml +++ b/.github/workflows/create_package.yml @@ -9,9 +9,25 @@ on: workflow_dispatch: jobs: + check_changelog: + name: Check Changelog + runs-on: ubuntu-latest + steps: + - name: Verify Changelog + id: verify_changelog + if: ${{ github.ref == 'refs/heads/master' }} + uses: SunshineStream/actions/verify_changelog@v0 + with: + token: ${{ secrets.GITHUB_TOKEN }} + outputs: + next_version: ${{ steps.verify_changelog.outputs.changelog_parser_version }} + last_version: ${{ steps.verify_changelog.outputs.latest_release_tag_name }} + release_body: ${{ steps.verify_changelog.outputs.changelog_parser_description }} + build_appimage: name: AppImage runs-on: ubuntu-20.04 + needs: check_changelog steps: - name: Checkout @@ -87,14 +103,19 @@ jobs: name: sunshine-AppImage path: artifacts/ - name: Create Release + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} uses: SunshineStream/actions/create_release@v0 with: token: ${{ secrets.GITHUB_TOKEN }} + next_version: ${{ needs.check_changelog.outputs.next_version }} + last_version: ${{ needs.check_changelog.outputs.last_version }} + release_body: ${{ needs.check_changelog.outputs.release_body }} build_linux: name: Linux runs-on: ubuntu-20.04 + needs: check_changelog strategy: fail-fast: true # false to test all, true to fail entire job if any fail matrix: @@ -138,10 +159,14 @@ jobs: uses: SunshineStream/actions/create_release@v0 with: token: ${{ secrets.GITHUB_TOKEN }} + next_version: ${{ needs.check_changelog.outputs.next_version }} + last_version: ${{ needs.check_changelog.outputs.last_version }} + release_body: ${{ needs.check_changelog.outputs.release_body }} build_win: name: Windows runs-on: windows-2019 + needs: check_changelog steps: - name: Checkout @@ -194,6 +219,10 @@ jobs: name: sunshine-${{ runner.os }} path: artifacts/ - name: Create Release + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} uses: SunshineStream/actions/create_release@v0 with: token: ${{ secrets.GITHUB_TOKEN }} + next_version: ${{ needs.check_changelog.outputs.next_version }} + last_version: ${{ needs.check_changelog.outputs.last_version }} + release_body: ${{ needs.check_changelog.outputs.release_body }} From a2c45f8de0f788ee50501c5b7a4c502f0523669d Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 11 Jan 2022 18:03:30 -0500 Subject: [PATCH 103/106] Update create_package.yml -Fix typo in Windows build --- .github/workflows/create_package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create_package.yml b/.github/workflows/create_package.yml index d6d43916fca..81123f062cd 100644 --- a/.github/workflows/create_package.yml +++ b/.github/workflows/create_package.yml @@ -201,7 +201,7 @@ jobs: - name: Package Windows run: | cd sunshine-windows-build - Del ..\assets\apps_linux.json + del ..\assets\apps_linux.json 7z a Sunshine-Windows.zip ..\assets 7z a Sunshine-Windows.zip sunshine.exe 7z a Sunshine-Windows.zip tools\dxgi-info.exe @@ -211,7 +211,7 @@ jobs: 7z a Sunshine-Windows.zip ..\tools\uninstall-service.bat cd .. mkdir artifacts - move "sunshine-windows-build/Sunshine-Windows.zip" "artifats" + move "sunshine-windows-build\Sunshine-Windows.zip" "artifacts" - name: Upload Artifacts if: ${{ github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }} uses: actions/upload-artifact@v2 From 8781fbcc204f4f5433ab52c0a14d6be0458fffaf Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 11 Jan 2022 18:35:05 -0500 Subject: [PATCH 104/106] Update create_package.yml - github.base_ref is needed for pull request check --- .github/workflows/create_package.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create_package.yml b/.github/workflows/create_package.yml index 81123f062cd..95033fd6897 100644 --- a/.github/workflows/create_package.yml +++ b/.github/workflows/create_package.yml @@ -15,7 +15,8 @@ jobs: steps: - name: Verify Changelog id: verify_changelog - if: ${{ github.ref == 'refs/heads/master' }} + if: ${{ github.ref == 'refs/heads/master' || github.base_ref == 'master' }} + # base_ref for pull request check, ref for push uses: SunshineStream/actions/verify_changelog@v0 with: token: ${{ secrets.GITHUB_TOKEN }} From f2c53a52c20656a210c155ab4980b790a40683ec Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 11 Jan 2022 18:55:58 -0500 Subject: [PATCH 105/106] Update create_package.yml -Verify changelog requires checkout --- .github/workflows/create_package.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/create_package.yml b/.github/workflows/create_package.yml index 95033fd6897..1a716929de3 100644 --- a/.github/workflows/create_package.yml +++ b/.github/workflows/create_package.yml @@ -13,6 +13,9 @@ jobs: name: Check Changelog runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Verify Changelog id: verify_changelog if: ${{ github.ref == 'refs/heads/master' || github.base_ref == 'master' }} From 55ac123d036a5a70bc3ac22053692820fac900ae Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Wed, 12 Jan 2022 19:01:00 -0500 Subject: [PATCH 106/106] Update history --- CHANGELOG.md | 112 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 104 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a052870d7e..1bb6ca490e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,108 @@ # Changelog -## [0.0.0] - 2022-01-11 +## [v0.11.1] - 2020-10-04 +### Changed +- (Linux) Fix search path for config file and assets + +## [v0.11.0] - 2020-10-04 +### Added +- (Linux) Added support for wlroots based compositors on Wayland. +- (Windows) Added an icon for the executable +### Changed +- Fixed a bug causing segfault when connecting multiple controllers. +- (Linux) Improved NVENC, it now offloads converting images from RGB to NV12 +- (Linux) Fixed a bug causes stuttering + +## [v0.10.1] - 2020-08-21 +### Changed +- (Linux) Re-enabled KMS + +## [v0.10.0] - 2020-08-20 +### Added +- Added support for Rumble with gamepads. +- Added support for keyboard shortcuts <--- See the README for details. +- (Windows) A very basic script has been added in Sunshine-Windows\tools <-- This will start Sunshine at boot with the highest privileges which is needed to display the login prompt. +### Changed +- Some cosmetic changes to the WebUI. +- The first time the WebUI is opened, it will request the creation of a username/password pair from the user. +- Fixed audio crackling introduced in version 0.8.0 +- (Linux) VAAPI hardware encoding now works on Intel i7-6700 at least. <-- For the best experience, using ffmpeg version 4.3 or higher is recommended. +- (Windows) Installing from debian package shouldn't overwrite your configuration files anymore. <-- It's recommended that you back up `/etc/sunshine/` before testing this. + +## [v0.9.0] - 2020-07-11 ### Added --Github Pull Request Tests --Github Automated Release --Github Issue Template --Github Pull Request Template --AppImage packaging during PR Test and Release --Fedora build test during PR Test and Release (no package available yet) +- Added audio encryption +- (Linux) Added basic NVENC support on Linux +- (Windows) The Windows version can now capture the lock screen and the UAC prompt as long as it's run through `PsExec.exe` https://docs.microsoft.com/en-us/sysinternals/downloads/psexec ### Changed --Renamed Dockerfiles +- Sunshine will now accept expired or not-yet-valid certificates, as long as they are signed properly. +- Fixed compatibility with iOS version of Moonlight +- Drastically reduced chance of being forced to skip error correction due to video frame size +- (Linux) sunshine.service will be installed automatically. + +## [v0.8.0] - 2020-06-30 +### Added +- Added mDNS support: Moonlight will automatically find Sunshine. +- Added UPnP support. It's off by default. + +## [v0.7.7] - 2020-06-24 +### Added +- (Linux) Added installation package for Debian +### Changed +- Fixed incorrect scaling for absolute mouse coordinates when using multiple monitors. +- Fixed incorrect colors when scaling for software encoder + +## [v0.7.1] - 2020-06-18 +### Changed +- (Linux) Fixed an issue where it was impossible to start sunshine on ubuntu 20.04 + +## [v0.7.0] - 2020-06-16 +### Added +- Added a Web Manager. Accessible through: https://localhost:47990 or https://:47990 +- (Linux) Added hardware encoding support for AMD on Linux +### Changed +- (Linux) Moved certificates and saved pairings generated during runtime to .config/sunshine on Linux + +## [v0.6.0] - 2020-05-26 +### Added +- Added support for surround audio +### Changed +- Maintain aspect ratio when scaling video +- Fix issue where Sunshine is forced to drop frames when they are too large + +## [v0.5.0] - 2020-05-13 +### Added +- Added support for absolute mouse coordinates +- (Linux) Added support for streaming specific monitor on Linux +- (Windows) Added support for AMF on Windows + +## [v0.4.0] - 2020-05-03 +### Changed +- prep-cmd is now optional in apps.json +- Fixed bug causing video artifacts +- Fixed bug preventing Moonlight from closing app on exit +- Fixed bug causing preventing keyboard keys from repeating on latest version of Moonlight +- Fixed bug causing segfault when another session of sunshine was already running +- Fixed bug causing crash when monitor has resolution 1366x768 + +## [v0.3.1] - 2020-04-24 +### Changed +- Fix a memory leak. + +## [v0.3.0] - 2020-04-23 +### Changed +- Hardware acceleration on NVidia GPU's for Video encoding on Windows + +## [v0.2.0] - 2020-03-21 +### Changed +- Multicasting is now supported: You can set the maximum simultaneous connections with the configurable option: channels +- Configuration variables can be overwritten on the command line: "name=value" --> it can be useful to set min_log_level=debug without modifying the configuration file +- Switches to make testing the pairing mechanism more convenient has been added, see "sunshine --help" for details + +## [v0.1.1] - 2020-01-30 +### Added +- (Linux) Added deb package and service for Linux + +## [v0.1.0] - 2020-01-27 +### Added +- The first official release for Sunshine!