Merge pull request #1756 from LizardByte/nightly

v0.22.0

.codeql-prebuild-cpp.sh

@@ -15,6 +15,7 @@ sudo apt-get install -y \
   libcurl4-openssl-dev \
   libdrm-dev \
   libevdev-dev \
+  libminiupnpc-dev \
   libmfx-dev \
   libnotify-dev \
   libnuma-dev \

.github/workflows/CI.yml

@@ -251,7 +251,7 @@ jobs:
             ../artifacts/sunshine_debug_${{ matrix.arch }}.flatpak dev.lizardbyte.sunshine.Debug'
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: sunshine-linux-flatpak-${{ matrix.arch }}
           path: artifacts/
@@ -286,7 +286,7 @@ jobs:
       - name: Maximize build space
         uses: easimon/maximize-build-space@v8
         with:
-          root-reserve-mb: 20480
+          root-reserve-mb: 30720
           remove-dotnet: 'true'
           remove-android: 'true'
           remove-haskell: 'true'
@@ -325,7 +325,7 @@ jobs:
             # install newer tar from focal... appimagelint fails on 18.04 without this
             echo "original tar version"
             tar --version
-            wget -O tar.deb http://security.ubuntu.com/ubuntu/pool/main/t/tar/tar_1.30+dfsg-7ubuntu0.20.04.2_amd64.deb
+            wget -O tar.deb http://security.ubuntu.com/ubuntu/pool/main/t/tar/tar_1.30+dfsg-7ubuntu0.20.04.3_amd64.deb
             sudo apt-get -y install -f ./tar.deb
             echo "new tar version"
             tar --version
@@ -350,6 +350,7 @@ jobs:
             libcurl4-openssl-dev \
             libdrm-dev \
             libevdev-dev \
+            libminiupnpc-dev \
             libmfx-dev \
             libnotify-dev \
             libnuma-dev \
@@ -398,10 +399,10 @@ jobs:
           mkdir -p build
           mkdir -p artifacts
 
-          npm install
-
           cd build
-          cmake -DCMAKE_BUILD_TYPE=Release \
+          cmake \
+            -DBUILD_WERROR=ON \
+            -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_INSTALL_PREFIX=/usr \
             -DSUNSHINE_ASSETS_DIR=share/sunshine \
             -DSUNSHINE_EXECUTABLE_PATH=/usr/bin/sunshine \
@@ -427,7 +428,9 @@ jobs:
           fi
 
       - name: Set AppImage Version
-        if: ${{ matrix.type == 'AppImage' && ( needs.check_changelog.outputs.next_version_bare != needs.check_changelog.outputs.last_version ) }}  # yamllint disable-line rule:line-length
+        if: |
+          matrix.type == 'AppImage' &&
+          (needs.check_changelog.outputs.next_version_bare != needs.check_changelog.outputs.last_version)
         run: |
           version=${{ needs.check_changelog.outputs.next_version_bare }}
           echo "VERSION=${version}" >> $GITHUB_ENV
@@ -483,7 +486,7 @@ jobs:
           ./appimagelint-x86_64.AppImage ./artifacts/sunshine.AppImage
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: sunshine-linux-${{ matrix.type }}-${{ matrix.dist }}
           path: artifacts/
@@ -506,6 +509,8 @@ jobs:
     name: MacOS
     runs-on: macos-11
     needs: [check_changelog, setup_release]
+    env:
+      BOOST_VERSION: 1.83.0
 
     steps:
       - name: Checkout
@@ -516,27 +521,71 @@ jobs:
       - name: Setup Dependencies MacOS
         run: |
           # install dependencies using homebrew
-          brew install boost cmake curl node opus pkg-config
+          brew install cmake curl miniupnpc node openssl opus pkg-config
 
           # fix openssl header not found
-          ln -sf /usr/local/opt/openssl/include/openssl /usr/local/include/openssl
+          # ln -sf /usr/local/opt/openssl/include/openssl /usr/local/include/openssl
+
+          # by installing boost from source, several headers cannot be found...
+          # the above commented out link only works if boost is installed from homebrew... does not make sense
+          ln -sf $(find /usr/local/Cellar -type d -name "openssl" -path "*/openssl@3/*/include" | head -n 1) \
+            /usr/local/include/openssl
+
+          # fix opus header not found
+          ln -sf $(find /usr/local/Cellar -type d -name "opus" -path "*/opus/*/include" | head -n 1) \
+            /usr/local/include/opus
+
+          # fix miniupnpc header not found
+          ln -sf $(find /usr/local/Cellar -type d -name "miniupnpc" -path "*/miniupnpc/*/include" | head -n 1) \
+            /usr/local/include/miniupnpc
+
+      - name: Install Boost
+        # installing boost from homebrew takes 30 minutes in a GitHub runner
+        run: |
+          export BOOST_ROOT=${HOME}/boost-${BOOST_VERSION}
+
+          # install boost
+          wget \
+            https://github.com/boostorg/boost/releases/download/boost-${BOOST_VERSION}/boost-${BOOST_VERSION}.tar.gz \
+            --progress=bar:force:noscroll -q --show-progress
+          tar xf boost-${BOOST_VERSION}.tar.gz
+          cd boost-${BOOST_VERSION}
+
+          # libdir should be set by --prefix but isn't
+          ./bootstrap.sh \
+            --prefix=${BOOST_ROOT} \
+            --libdir=${BOOST_ROOT}/lib \
+            --with-libraries=locale,log,program_options,system,thread
+          ./b2 headers
+          ./b2 install \
+            --prefix=${BOOST_ROOT} \
+            --libdir=${BOOST_ROOT}/lib \
+            -j$(sysctl -n hw.ncpu) \
+            link=shared,static \
+            variant=release \
+            cxxflags=-std=c++14 \
+            cxxflags=-stdlib=libc++ \
+            linkflags=-stdlib=libc++
+
+          # put boost in cmake prefix path
+          echo "BOOST_ROOT=${BOOST_ROOT}" >> ${GITHUB_ENV}
 
       - name: Build MacOS
         env:
           BRANCH: ${{ github.head_ref || github.ref_name }}
           BUILD_VERSION: ${{ needs.check_changelog.outputs.next_version_bare }}
           COMMIT: ${{ github.event.pull_request.head.sha || github.sha }}
         run: |
-          npm install
-
           mkdir build
           cd build
-          cmake -DCMAKE_BUILD_TYPE=Release \
+          cmake \
+            -DBUILD_WERROR=ON \
+            -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_INSTALL_PREFIX=/usr \
             -DSUNSHINE_ASSETS_DIR=local/sunshine/assets \
             -DSUNSHINE_EXECUTABLE_PATH=/usr/bin/sunshine \
             ..
-          make -j ${nproc}
+          make -j $(sysctl -n hw.ncpu)
 
       - name: Package MacOS
         run: |
@@ -551,7 +600,7 @@ jobs:
           # mv ./cpack_artifacts/Sunshine.dmg ../artifacts/sunshine-bundle.dmg
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: sunshine-macos
           path: artifacts/
@@ -676,7 +725,7 @@ jobs:
           echo "::endgroup::"
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: sunshine-macports
           path: artifacts/
@@ -719,19 +768,18 @@ jobs:
             mingw-w64-x86_64-boost
             mingw-w64-x86_64-cmake
             mingw-w64-x86_64-curl
-            mingw-w64-x86_64-onevpl
+            mingw-w64-x86_64-miniupnpc
+            mingw-w64-x86_64-nlohmann-json
+            mingw-w64-x86_64-nodejs
             mingw-w64-x86_64-nsis
+            mingw-w64-x86_64-onevpl
             mingw-w64-x86_64-openssl
             mingw-w64-x86_64-opus
             mingw-w64-x86_64-toolchain
             nasm
             wget
             yasm
 
-      - name: Install npm packages
-        run: |
-          npm install
-
       - name: Build Windows
         shell: msys2 {0}
         env:
@@ -741,7 +789,9 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+          cmake \
+            -DBUILD_WERROR=ON \
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
             -DSUNSHINE_ASSETS_DIR=assets \
             -G "MinGW Makefiles" \
             ..
@@ -771,7 +821,7 @@ jobs:
             a "../artifacts/sunshine-debuginfo-win32.zip" "*.exe"
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: sunshine-windows
           path: artifacts/

.github/workflows/automerge.yml

@@ -31,7 +31,7 @@ jobs:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
       - name: Label autoapproved
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.GH_BOT_TOKEN }}
           script: |

.github/workflows/ci-docker.yml

@@ -395,7 +395,7 @@ jobs:
 
       - name: Upload Artifacts
         if: ${{ steps.prepare.outputs.artifacts == 'true' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Docker${{ matrix.tag }}
           path: artifacts/