Workflow updates

- Do not re-run PR tests on edited PRs
- Close added/fixed issues on published release
- Issues stale after 60 days instead of 30, close after 10 days instead of 5
- Use Vankka/pr-target-branch-action for checking that PR is made to proper branch
- Add version number to sphinx config, must use cmake to configure the file
- Add jobs to readthedocs.yaml configuration

.github/workflows/CI.yml

@@ -3,7 +3,7 @@ name: CI
 on:
   pull_request:
     branches: [master, nightly]
-    types: [opened, synchronize, edited, reopened]
+    types: [opened, synchronize, reopened]
   push:
     branches: [master]
   workflow_dispatch:

.github/workflows/clang.yml

@@ -3,7 +3,7 @@ name: clang-format-lint
 on:
   pull_request:
     branches: [master, nightly]
-    types: [opened, synchronize, edited, reopened]
+    types: [opened, synchronize, reopened]
 
 jobs:
   lint:

.github/workflows/issues-closer.yml

@@ -0,0 +1,21 @@
+name: Close Added/Fixed Issues
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  close_issues:
+    name: Check Issues / PRs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Close Issues (added/fixed)
+        uses: actions/stale@v3
+        with:
+          only-issues-labels: 'added,fixed'
+          close-issue-message: >
+            This is now available in the latest release.
+          close-issue-label: 'released'
+          days-before-issue-stale: 0
+          days-before-issue-close: 0
+          ignore-updates: true

.github/workflows/issues-stale.yml

@@ -26,8 +26,8 @@ jobs:
             This PR was closed because it has been stalled for 5 days with no activity.
           stale-pr-label: 'stale'
           exempt-pr-labels: 'status:in-progress'
-          days-before-stale: 30
+          days-before-stale: 60
-          days-before-close: 5
+          days-before-close: 10
 
       - name: Invalid Template
         uses: actions/stale@v5

.github/workflows/pull-requests.yml

@@ -5,31 +5,17 @@ on:
     types: [opened, synchronize, edited, reopened]
 
 jobs:
-  check-branch:
+  check-pull-request:
     name: Check Pull Request
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Code
+      - uses: Vankka/pr-target-branch-action@v2
-        uses: actions/checkout@v3
+        env:
-
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Branch check
-        if: ( github.head_ref == 'repo-sync/common-repo-files/default' && github.base_ref == 'master' ) || ( github.head_ref == 'nightly' && github.base_ref == 'master' )
-        run: |
-          echo Base: "$GITHUB_BASE_REF"
-          echo Head: "$GITHUB_HEAD_REF"
-          echo "branch=True" >> $GITHUB_ENV
-
-      - name: Comment on Pull Request
-        uses: mshick/add-pr-comment@v1
-        if: github.base_ref != 'nightly' && env.branch != 'True'
         with:
-          message: Pull requests must be made to the `nightly` branch. Thanks.
+          target: master
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          exclude: nightly # Don't prevent going from nightly -> master
-          repo-token-user-login: 'github-actions[bot]'
+          change-to: nightly
-
+          comment: |
-      - name: Fail Workflow
+              Your PR was set to `master`, PRs should be sent to `nightly`
-        if: github.base_ref != 'nightly' && env.branch != 'True'
+              The base branch of this PR has been automatically changed to `nightly`, please check that there are no merge conflicts
-        run: |
-          echo Base: "$GITHUB_BASE_REF"
-          echo Head: "$GITHUB_HEAD_REF"
-          exit 1

.readthedocs.yaml

@@ -10,6 +10,11 @@ build:
   os: ubuntu-20.04
   tools:
     python: "3.9"
+  jobs:
+    post_system_dependencies:
+      - apt-get install cmake
+    pre_create_environment:
+      - cmake ..
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:

CMakeLists.txt

@@ -319,6 +319,7 @@ else()
 endif()
 
 configure_file(version.h.in version.h @ONLY)
+configure_file(docs/source/conf.py.in "${CMAKE_CURRENT_SOURCE_DIR}/docs/source/conf.py" @ONLY)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 set(SUNSHINE_TARGET_FILES

docs/source/conf.py.in

@@ -26,7 +26,7 @@ copyright = f'{datetime.now ().year}, {project}'
 author = 'ReenigneArcher'
 
 # The full version, including alpha/beta/rc tags
-# version = '0.13.0'
+version = '@PROJECT_VERSION@'
 
 
 # -- General configuration ---------------------------------------------------
@@ -60,7 +60,7 @@ source_suffix = ['.rst', '.md']
 # so a file named "default.css" will overwrite the builtin "default.css".
 # html_static_path = ['_static']
 
-html_logo = os.path.join(root_dir, 'sunshine.ico')
+html_logo = os.path.join(root_dir, 'sunshine.png')
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.