Merge branch 'master' of https://github.com/obsproject/obs-studio

.cmake-format.json

@@ -0,0 +1,14 @@
+{
+    "additional_commands": {
+      "find_qt": {
+        "flags": [],
+        "kwargs": {
+          "VERSION": "+",
+          "COMPONENTS": "+",
+          "COMPONENTS_WIN": "+",
+          "COMPONENTS_MACOS": "+",
+          "COMPONENTS_LINUX": "+"
+        }
+      }
+    }
+}

.editorconfig

@@ -17,3 +17,15 @@ indent_size = 8
 [plugins/obs-outputs/librtmp/*.{cpp,c,h}]
 indent_style = space
 indent_size = 4
+
+[CMakeLists.txt]
+indent_style = space
+indent_size = 2
+
+[**/CMakeLists.txt]
+indent_style = space
+indent_size = 2
+
+[cmake/**/*.cmake]
+indent_style = space
+indent_size = 2

.github/workflows/clang-format.yml

@@ -1,21 +1,27 @@
 name: Clang Format Check
 
-on: [push, pull_request]
+on:
+  push:
+    paths-ignore: ['**.md']
+    branches-ignore: [master]
+  pull_request:
+    paths-ignore: ['**.md']
+    branches-ignore: [master]
 
 jobs:
   clang-format-check:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: 'recursive'
 
       - name: Install clang format
         run: |
           sudo apt-get install -y clang-format-12
 
-      - name: Check the Formatting
+      - name: 'Run clang-format'
         run: |
-          ./formatcode.sh
           ./CI/check-format.sh
+          ./CI/check-changes.sh

.github/workflows/crowdin-sync-download.yml

@@ -7,15 +7,9 @@ jobs:
     env:
       CROWDIN_PAT: ${{ secrets.CROWDIN_SYNC_CROWDIN_PAT }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
           fetch-depth: 0
           token: ${{ secrets.CROWDIN_SYNC_GITHUB_PAT }}
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 16
-      - name: Download Script
-        run: wget -P ./other/ https://raw.githubusercontent.com/obsproject/crowdin-synchronization/0.1.2/dist/download.mjs
-      - name: Import latest translations from Crowdin
-        run: node ./other/download.mjs
+      - uses: obsproject/obs-crowdin-sync/[email protected]

.github/workflows/crowdin-sync-upload.yml

@@ -13,14 +13,8 @@ jobs:
       CROWDIN_PAT: ${{ secrets.CROWDIN_SYNC_CROWDIN_PAT }}
       GITHUB_EVENT_BEFORE: ${{ github.event.before }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
           fetch-depth: 100
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 16
-      - name: Download Script
-        run: wget -P ./other/ https://raw.githubusercontent.com/obsproject/crowdin-synchronization/0.1.2/dist/upload.mjs
-      - name: Upload English strings to Crowdin
-        run: node ./other/upload.mjs
+      - uses: obsproject/obs-crowdin-sync/[email protected]

.github/workflows/docs.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Bump Version Number
         shell: bash
         if: github.event_name == 'push'
@@ -39,7 +39,7 @@ jobs:
       - uses: ammaraskar/sphinx-action@master
         with:
           docs-folder: "docs/sphinx/"
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v3
         with:
           name: OBS Studio Documentation (HTML)
           path: docs/sphinx/_build/html/

.github/workflows/flatpak.yml

@@ -3,12 +3,6 @@
 name: Flatpak
 
 on:
-  push:
-    paths-ignore: ['**.md']
-    branches: [master, 'release/**']
-  pull_request:
-    paths-ignore: ['**.md']
-    branches: [master, 'release/**']
   release:
     types: [published]
     branches: [master, 'release/**']
@@ -24,44 +18,10 @@ env:
   YOUTUBE_SECRET_HASH: ${{ secrets.YOUTUBE_SECRET_HASH }}
 
 jobs:
-  generate_bundle:
-    name: Generate Flatpak Bundle
-    runs-on: [ubuntu-latest]
-    if: github.event_name != 'release'
-    container:
-      image: bilelmoussaoui/flatpak-github-actions:kde-5.15-21.08
-      options: --privileged
-    steps:
-      - name: 'Check for Github Labels'
-        if: github.event_name == 'pull_request'
-        shell: bash
-        run: |
-          LABELS_URL="$(echo ${{ github.event.pull_request.url }} | sed s'/pulls/issues/')"
-          LABEL_FOUND="$(curl -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" "${LABELS_URL}/labels" | sed -n 's/.*"name": "\(.*\)",/\1/p' | grep 'Seeking Testers' || true)"
-          if [ "${LABEL_FOUND}" = "Seeking Testers" ]; then
-            echo "SEEKING_TESTERS=1" >> $GITHUB_ENV
-          else
-            echo "SEEKING_TESTERS=0" >> $GITHUB_ENV
-          fi
-
-      - name: Checkout
-        uses: actions/[email protected]
-        if: success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1')
-        with:
-          submodules: 'recursive'
-
-      - name: Build Flatpak Manifest
-        uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
-        if: success() && (github.event_name != 'pull_request' || env.SEEKING_TESTERS == '1')
-        with:
-          bundle: obs-studio-${{ github.sha }}.flatpak
-          manifest-path: CI/flatpak/com.obsproject.Studio.json
-          cache-key: flatpak-builder-${{ github.sha }}
-
   publish:
     name: Publish to Flathub
     runs-on: [ubuntu-latest]
-    if: github.event_name == 'release'
+    if: "${{ github.event_name == 'release' && ( matrix.branch != 'stable' || (!contains(github.ref, '-beta') && !contains(github.ref, '-rc')) ) }}"
     env:
       FLATPAK_BUILD_PATH: flatpak_app/files/share
     container:
@@ -71,23 +31,20 @@ jobs:
       matrix:
         branch: [stable, beta]
     steps:
-      - name: Check if job should run
-        id: should_run
-        if: "${{ matrix.branch != 'stable' || (!contains(github.ref, '-beta') && !contains(github.ref, '-rc')) }}"
-        run: |
-          echo "::set-output name=should_run::yes"
-
       - name: Checkout
-        uses: actions/[email protected]
-        if: steps.should_run.outputs.should_run == 'yes'
+        uses: actions/checkout@v3
         with:
           submodules: 'recursive'
 
+      - name: 'Setup build environment'
+        id: setup
+        run: |
+          echo "::set-output name=commitHash::$(git rev-parse --short=9 HEAD)"
+
       - name: Build Flatpak Manifest
         uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@master
-        if: steps.should_run.outputs.should_run == 'yes'
         with:
-          bundle: obs-studio-${{ github.sha }}.flatpak
+          bundle: obs-studio-${{ steps.setup.outputs.commitHash }}.flatpak
           manifest-path: CI/flatpak/com.obsproject.Studio.json
           cache-key: flatpak-builder-${{ github.sha }}
           mirror-screenshots-url: https://dl.flathub.org/repo/screenshots
@@ -96,34 +53,31 @@ jobs:
       - name: Validate AppStream
         shell: bash
         working-directory: ${{ env.FLATPAK_BUILD_PATH }}
-        if: steps.should_run.outputs.should_run == 'yes'
         run: |
           appstream-util validate appdata/com.obsproject.Studio.appdata.xml
 
       - name: Verify icon and metadata in app-info
         shell: bash
         working-directory: ${{ env.FLATPAK_BUILD_PATH }}
-        if: steps.should_run.outputs.should_run == 'yes'
         run: |
           test -f app-info/icons/flatpak/128x128/com.obsproject.Studio.png || { echo "Missing 128x128 icon in app-info" ; exit 1; }
           test -f app-info/xmls/com.obsproject.Studio.xml.gz || { echo "Missing com.obsproject.Studio.xml.gz in app-info" ; exit 1; }
 
       - name: Commit screenshots to the OSTree repository
-        if: steps.should_run.outputs.should_run == 'yes'
         run: |
           ostree commit --repo=repo --canonical-permissions --branch=screenshots/x86_64 flatpak_app/screenshots
 
       - name: Publish to Flathub Beta
         uses: bilelmoussaoui/flatpak-github-actions/flat-manager@v4
-        if: steps.should_run.outputs.should_run == 'yes' && matrix.branch == 'beta'
+        if: matrix.branch == 'beta'
         with:
           flat-manager-url: https://hub.flathub.org/
           repository: beta
           token: ${{ secrets.FLATHUB_BETA_TOKEN }}
 
       - name: Publish to Flathub
         uses: bilelmoussaoui/flatpak-github-actions/flat-manager@v4
-        if: steps.should_run.outputs.should_run == 'yes' && matrix.branch == 'stable'
+        if: matrix.branch == 'stable'
         with:
           flat-manager-url: https://hub.flathub.org/
           repository: stable