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 01/93] 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 90326429..5f842283 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 02/93] 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 5f842283..a13c6ff5 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 5c2068d4..16e99ac8 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 03/93] 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 a13c6ff5..4c340d26 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 04/93] 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 4c340d26..869be41c 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 05/93] 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 869be41c..85148cd6 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 06/93] 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 85148cd6..7a586a10 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 07/93] 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 7a586a10..159e2655 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 08/93] 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 159e2655..6cc6d9cb 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 09/93] 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 6cc6d9cb..f3c92ded 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 10/93] 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 f3c92ded..3666ddcc 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 11/93] 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 3666ddcc..fbc5e914 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 12/93] 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 fbc5e914..77d56345 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 13/93] 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 77d56345..4a2335dc 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 14/93] 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 4a2335dc..69209a5e 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 15/93] 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 69209a5e..0d8424cf 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 16/93] 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 0d8424cf..a4d8a283 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 17/93] 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 a4d8a283..ea7ad4bc 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 18/93] 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 ea7ad4bc..df3efca3 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 19/93] 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 df3efca3..02a0b2d8 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 20/93] 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 02a0b2d8..b2a4e65c 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 21/93] 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 b2a4e65c..09c4c753 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 22/93] 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 09c4c753..f8c11834 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 23/93] 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 f8c11834..0b9d5f7b 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 24/93] 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 0b9d5f7b..c698e741 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 25/93] 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 c698e741..4e870034 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 26/93] 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 4e870034..3eb511ac 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 7a418aaa..40d6b807 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 00000000..48507f64 --- /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 00000000..c311cd65 --- /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 fe4dc326..b3d44bbe 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 00000000..ea69f455 --- /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 b8174a36..83c17483 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 00000000..a7f65f3b --- /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 27/93] 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 3eb511ac..4d360ed6 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 40d6b807..7fb08089 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 28/93] 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 48507f64..cf0b138f 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 29/93] 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 c311cd65..ef18d6f0 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 30/93] 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 b3d44bbe..eec1a4ac 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 31/93] 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 cf0b138f..793e64e4 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 ef18d6f0..80e39eec 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 eec1a4ac..2941a0b1 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 32/93] 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 253a4d45..0444edc7 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 793e64e4..03075d04 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 80e39eec..04628c09 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 2941a0b1..1b8ffd18 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 ea69f455..75169813 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 83c17483..1972e2be 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 a7f65f3b..d5fab928 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 33/93] 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 0444edc7..fbcffd74 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 03075d04..af5a40be 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 04628c09..6596f561 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 1b8ffd18..2ceac2b5 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 75169813..e6baea1a 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 1972e2be..a584d6e3 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 d5fab928..dc067231 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 34/93] 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 4d360ed6..bce55cfe 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 35/93] 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 2ceac2b5..0ef8a085 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 36/93] 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 af5a40be..4e2c04de 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 6596f561..cec2c960 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 37/93] 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 cec2c960..58b3f32e 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 38/93] 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 bce55cfe..c62ab5d8 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 39/93] 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 4e2c04de..c0143e8c 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 58b3f32e..2beca2f8 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 0ef8a085..2c732eb5 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 e6baea1a..713726a4 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 a584d6e3..6c644d4e 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 dc067231..faff3c1b 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 40/93] 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 fbcffd74..15f0d656 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 2c732eb5..480589b9 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 713726a4..878e0f49 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 6c644d4e..d5668df4 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 faff3c1b..14770625 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 41/93] 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 c0143e8c..7dad9f57 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 2beca2f8..1b52b5fa 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 42/93] 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 480589b9..c4701312 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 43/93] 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 c4701312..5e12f448 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 44/93] 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 5e12f448..4a0982b4 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 45/93] 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 7dad9f57..ae7e4959 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 46/93] 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 1b52b5fa..0cde7aa4 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 47/93] 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 4a0982b4..52a896a9 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 48/93] 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 52a896a9..a66dd134 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 49/93] 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 a66dd134..bff3432f 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 50/93] 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 bff3432f..75662174 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 51/93] 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 c62ab5d8..c907c94e 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 52/93] 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 c907c94e..b6f2205a 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 53/93] 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 b6f2205a..5e4aacb2 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 54/93] 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 5e4aacb2..47b13d34 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 55/93] 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 47b13d34..b1613413 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 56/93] 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 b1613413..ca99ae20 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 57/93] 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 ca99ae20..1b3f2dcd 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 58/93] 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 1b3f2dcd..4288b74c 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 59/93] 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 75662174..38429460 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 60/93] 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 38429460..5ee33ae3 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 878e0f49..76775708 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 61/93] 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 5ee33ae3..34e075c2 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 62/93] 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 34e075c2..dfeb039a 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 63/93] 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 dfeb039a..5ee33ae3 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 64/93] 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 76775708..ca457942 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 65/93] 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 4288b74c..fd8aac4c 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 66/93] 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 5ee33ae3..25e5c7a6 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 67/93] 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 25e5c7a6..416a0843 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 68/93] 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 416a0843..5b3b2de0 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 69/93] 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 5b3b2de0..1f873991 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 70/93] 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 1f873991..beb47c36 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 71/93] 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 beb47c36..5ee33ae3 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 72/93] 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 fd8aac4c..1dc15c21 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 73/93] 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 1dc15c21..502c0967 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 74/93] 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 d981593d..7fdef3fc 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 75/93] 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 502c0967..97cad4bd 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 ca457942..5a633a10 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 76/93] 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 00000000..e0c51484 --- /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 77/93] 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 00000000..314ecf81 --- /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 78/93] 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 97cad4bd..ea39634b 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 79/93] 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 ea39634b..e02abf98 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 80/93] 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 e02abf98..94922e4b 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 81/93] 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 94922e4b..77b40cb1 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 e0c51484..c95a689f 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 82/93] 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 77b40cb1..f38a11e3 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 83/93] 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 f38a11e3..0c307dde 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 84/93] 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 0c307dde..9e73b9c7 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 85/93] 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 69a8c99a..5da4784a 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 1526a754..ade64829 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 b49114bb..e8df86cd 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 86/93] 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 15f0d656..1ed73c5f 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 5ee33ae3..dad4c96b 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 5a633a10..689c820c 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 d5668df4..4beedac6 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 14770625..113d4f70 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 ade64829..283aeffe 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 87/93] 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 9e73b9c7..1a98d11b 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 88/93] 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 dad4c96b..5ee33ae3 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 689c820c..5a633a10 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 113d4f70..14770625 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 283aeffe..ade64829 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 89/93] 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 1ed73c5f..15f0d656 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 4beedac6..d5668df4 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 90/93] 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 1a98d11b..6829ce60 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 91/93] 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 c95a689f..00000000 --- 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 92/93] 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 6829ce60..1d7f4a26 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 93/93] 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 1d7f4a26..bf1d4dbb 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