Merge remote-tracking branch 'upstream/master' into dev/v13.x

Author: szmyd

.github/workflows/merge_build.yml

@@ -5,6 +5,8 @@ on:
   push:
     branches:
       - dev/v13.x
+      - stable/v12.x
+      - master
 
 jobs:
   Build:

.github/workflows/pr_build.yml

@@ -5,6 +5,8 @@ on:
   pull_request:
     branches:
       - dev/v13.x
+      - stable/v12.x
+      - master
 
 jobs:
   Build:

.jenkins/Jenkinsfile

@@ -6,30 +6,10 @@ pipeline {
         CONAN_USER = 'oss'
         TARGET_BRANCH = 'master'
         STABLE_BRANCH = 'stable/v*'
+        BUILD_MISSING = "--build missing"
     }
 
     stages {
-        stage('Adjust for Master/PR') {
-            when { not {
-                branch "${STABLE_BRANCH}"
-            } }
-            steps {
-                script {
-                    BUILD_MISSING = "--build missing"
-                }
-            }
-        }
-        stage('Adjust for Testing/Stable') {
-            when {
-                branch "${STABLE_BRANCH}"
-            }
-            steps {
-                script {
-                    BUILD_MISSING = ""
-                }
-            }
-        }
-
         stage('Get Version') {
             steps {
                 script {