From 698df6884d315d7856c7859f70476817334f4af0 Mon Sep 17 00:00:00 2001 From: Joe Mou <1091031+jmou@users.noreply.github.com> Date: Mon, 16 Sep 2024 19:31:44 -0400 Subject: [PATCH 1/5] build(cmake): Prioritize vendored includes over system-wide (#3182) --- cmake/compile_definitions/common.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/compile_definitions/common.cmake b/cmake/compile_definitions/common.cmake index 7b13168a..02ec7224 100644 --- a/cmake/compile_definitions/common.cmake +++ b/cmake/compile_definitions/common.cmake @@ -48,12 +48,12 @@ elseif(UNIX) endif() endif() -include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/third-party/nv-codec-headers/include") +include_directories(BEFORE SYSTEM "${CMAKE_SOURCE_DIR}/third-party/nv-codec-headers/include") file(GLOB NVENC_SOURCES CONFIGURE_DEPENDS "src/nvenc/*.cpp" "src/nvenc/*.h") list(APPEND PLATFORM_TARGET_FILES ${NVENC_SOURCES}) configure_file("${CMAKE_SOURCE_DIR}/src/version.h.in" version.h @ONLY) -include_directories("${CMAKE_CURRENT_BINARY_DIR}") # required for importing version.h +include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}") # required for importing version.h set(SUNSHINE_TARGET_FILES "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/src/Input.h" @@ -129,9 +129,10 @@ list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_PUBLISHER_NAME="${SUNSHINE_PUBLISHER_N list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_PUBLISHER_WEBSITE="${SUNSHINE_PUBLISHER_WEBSITE}") list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_PUBLISHER_ISSUE_URL="${SUNSHINE_PUBLISHER_ISSUE_URL}") -include_directories("${CMAKE_SOURCE_DIR}") +include_directories(BEFORE "${CMAKE_SOURCE_DIR}") include_directories( + BEFORE SYSTEM "${CMAKE_SOURCE_DIR}/third-party" "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/enet/include" From 6171c9fbadb9e314ff6fa14c81b505d673e48172 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 22:57:11 -0400 Subject: [PATCH 2/5] build(deps): bump LizardByte/create-release-action from 2024.614.221009 to 2024.919.143026 (#3204) * build(deps): bump LizardByte/create-release-action Bumps [LizardByte/create-release-action](https://github.com/lizardbyte/create-release-action) from 2024.614.221009 to 2024.919.143026. - [Release notes](https://github.com/lizardbyte/create-release-action/releases) - [Commits](https://github.com/lizardbyte/create-release-action/compare/v2024.614.221009...v2024.919.143026) --- updated-dependencies: - dependency-name: LizardByte/create-release-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * fix: remove unused input * fix: remove unused input --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> --- .github/workflows/CI.yml | 15 +++++---------- .github/workflows/ci-docker.yml | 3 +-- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3e31ee4c..d72fbd13 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -237,11 +237,10 @@ jobs: - name: Create/Update GitHub Release if: ${{ needs.setup_release.outputs.publish_release == 'true' }} - uses: LizardByte/create-release-action@v2024.614.221009 + uses: LizardByte/create-release-action@v2024.919.143026 with: allowUpdates: true body: ${{ needs.setup_release.outputs.release_body }} - discussionCategory: announcements generateReleaseNotes: ${{ needs.setup_release.outputs.release_generate_release_notes }} name: ${{ needs.setup_release.outputs.release_tag }} prerelease: true @@ -453,11 +452,10 @@ jobs: - name: Create/Update GitHub Release if: ${{ needs.setup_release.outputs.publish_release == 'true' }} - uses: LizardByte/create-release-action@v2024.614.221009 + uses: LizardByte/create-release-action@v2024.919.143026 with: allowUpdates: true body: ${{ needs.setup_release.outputs.release_body }} - discussionCategory: announcements generateReleaseNotes: ${{ needs.setup_release.outputs.release_generate_release_notes }} name: ${{ needs.setup_release.outputs.release_tag }} prerelease: true @@ -599,12 +597,11 @@ jobs: if: >- matrix.release && needs.setup_release.outputs.publish_release == 'true' - uses: LizardByte/create-release-action@v2024.614.221009 + uses: LizardByte/create-release-action@v2024.919.143026 with: allowUpdates: true artifacts: '${{ github.workspace }}/homebrew/*' body: ${{ needs.setup_release.outputs.release_body }} - discussionCategory: announcements generateReleaseNotes: ${{ needs.setup_release.outputs.release_generate_release_notes }} name: ${{ needs.setup_release.outputs.release_tag }} prerelease: true @@ -892,11 +889,10 @@ jobs: - name: Create/Update GitHub Release if: ${{ needs.setup_release.outputs.publish_release == 'true' }} - uses: LizardByte/create-release-action@v2024.614.221009 + uses: LizardByte/create-release-action@v2024.919.143026 with: allowUpdates: true body: ${{ needs.setup_release.outputs.release_body }} - discussionCategory: announcements generateReleaseNotes: ${{ needs.setup_release.outputs.release_generate_release_notes }} name: ${{ needs.setup_release.outputs.release_tag }} prerelease: true @@ -1187,11 +1183,10 @@ jobs: - name: Create/Update GitHub Release if: ${{ needs.setup_release.outputs.publish_release == 'true' }} - uses: LizardByte/create-release-action@v2024.614.221009 + uses: LizardByte/create-release-action@v2024.919.143026 with: allowUpdates: true body: ${{ needs.setup_release.outputs.release_body }} - discussionCategory: announcements generateReleaseNotes: ${{ needs.setup_release.outputs.release_generate_release_notes }} name: ${{ needs.setup_release.outputs.release_tag }} prerelease: true diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml index 2e84c662..a87fd299 100644 --- a/.github/workflows/ci-docker.yml +++ b/.github/workflows/ci-docker.yml @@ -334,12 +334,11 @@ jobs: - name: Create/Update GitHub Release if: ${{ needs.setup_release.outputs.publish_release == 'true' && steps.prepare.outputs.artifacts == 'true' }} - uses: LizardByte/create-release-action@v2024.614.221009 + uses: LizardByte/create-release-action@v2024.919.143026 with: allowUpdates: true artifacts: "*artifacts/*" body: ${{ needs.setup_release.outputs.release_body }} - discussionCategory: announcements generateReleaseNotes: ${{ needs.setup_release.outputs.release_generate_release_notes }} name: ${{ needs.setup_release.outputs.release_tag }} prerelease: true From ea871d21356ab0c7728f418f6d49c7c1d159dcd5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 09:37:44 -0400 Subject: [PATCH 3/5] build(deps): bump LizardByte/setup-release-action from 2024.801.192524 to 2024.919.143601 (#3206) build(deps): bump LizardByte/setup-release-action Bumps [LizardByte/setup-release-action](https://github.com/lizardbyte/setup-release-action) from 2024.801.192524 to 2024.919.143601. - [Release notes](https://github.com/lizardbyte/setup-release-action/releases) - [Commits](https://github.com/lizardbyte/setup-release-action/compare/v2024.801.192524...v2024.919.143601) --- updated-dependencies: - dependency-name: LizardByte/setup-release-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/CI.yml | 2 +- .github/workflows/ci-docker.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d72fbd13..0ea8c77d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -41,7 +41,7 @@ jobs: - name: Setup Release id: setup_release - uses: LizardByte/setup-release-action@v2024.801.192524 + uses: LizardByte/setup-release-action@v2024.919.143601 with: github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml index a87fd299..fd967709 100644 --- a/.github/workflows/ci-docker.yml +++ b/.github/workflows/ci-docker.yml @@ -115,7 +115,7 @@ jobs: - name: Setup Release id: setup_release - uses: LizardByte/setup-release-action@v2024.801.192524 + uses: LizardByte/setup-release-action@v2024.919.143601 with: dotnet: ${{ needs.check_dockerfiles.outputs.dotnet }} github_token: ${{ secrets.GITHUB_TOKEN }} From 61f51501d0ac14006e0209eac489fcc7e06f2722 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 10:53:10 -0400 Subject: [PATCH 4/5] build(deps): bump LizardByte/homebrew-release-action from 2024.809.31635 to 2024.919.145818 (#3207) build(deps): bump LizardByte/homebrew-release-action Bumps [LizardByte/homebrew-release-action](https://github.com/lizardbyte/homebrew-release-action) from 2024.809.31635 to 2024.919.145818. - [Release notes](https://github.com/lizardbyte/homebrew-release-action/releases) - [Commits](https://github.com/lizardbyte/homebrew-release-action/compare/v2024.809.31635...v2024.919.145818) --- updated-dependencies: - dependency-name: LizardByte/homebrew-release-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/CI.yml | 4 ++-- .github/workflows/update-homebrew-release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0ea8c77d..c022d193 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -584,7 +584,7 @@ jobs: - name: Validate Homebrew Formula if: | matrix.release != true - uses: LizardByte/homebrew-release-action@v2024.809.31635 + uses: LizardByte/homebrew-release-action@v2024.919.145818 with: formula_file: ${{ github.workspace }}/homebrew/sunshine.rb git_email: ${{ secrets.GH_BOT_EMAIL }} @@ -632,7 +632,7 @@ jobs: if: >- matrix.release && needs.setup_release.outputs.publish_release == 'true' - uses: LizardByte/homebrew-release-action@v2024.809.31635 + uses: LizardByte/homebrew-release-action@v2024.919.145818 with: formula_file: ${{ github.workspace }}/homebrew/sunshine-beta.rb git_email: ${{ secrets.GH_BOT_EMAIL }} diff --git a/.github/workflows/update-homebrew-release.yml b/.github/workflows/update-homebrew-release.yml index dc6ef218..d6acf476 100644 --- a/.github/workflows/update-homebrew-release.yml +++ b/.github/workflows/update-homebrew-release.yml @@ -61,7 +61,7 @@ jobs: if: >- steps.check.outputs.hasTopic == 'true' && fromJson(steps.download.outputs.downloaded_files)[0] - uses: LizardByte/homebrew-release-action@v2024.809.31635 + uses: LizardByte/homebrew-release-action@v2024.919.145818 with: formula_file: ${{ fromJson(steps.download.outputs.downloaded_files)[0] }} git_email: ${{ secrets.GH_BOT_EMAIL }} From 79446feae3fbafc09c473ce6352b053b19c348fd Mon Sep 17 00:00:00 2001 From: LizardByte-bot <108553330+LizardByte-bot@users.noreply.github.com> Date: Fri, 20 Sep 2024 13:42:57 -0400 Subject: [PATCH 5/5] chore: update global workflows (#3209) --- .github/ISSUE_TEMPLATE/config.yml | 13 ------------- .github/workflows/update-changelog.yml | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/config.yml diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index 296a44db..00000000 --- a/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# This action is centrally managed in https://github.com//.github/ -# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in -# the above-mentioned repo. - -blank_issues_enabled: false -contact_links: - - name: Support Center - url: https://app.lizardbyte.dev/support - about: Official LizardByte support - - name: Feature request - url: https://ideas.moonlight-stream.org - about: Share your suggestions or ideas to help Moonlight and Sunshine improve diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index 99d2793e..3c095fcf 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Update Changelog - uses: LizardByte/update-changelog-action@v2024.609.4705 + uses: LizardByte/update-changelog-action@v2024.919.152649 with: changelogBranch: changelog changelogFile: CHANGELOG.md