Simplify CI & review concurrency (#59)

Thilas · Jun 22, 2023 · 691e5f6 · 691e5f6
1 parent 3810e11
commit 691e5f6
Show file tree

Hide file tree

Showing 17 changed files with 34 additions and 32 deletions.
diff --git a/.github/workflows/.common.yml b/.github/workflows/.common.yml
@@ -14,6 +14,8 @@ on:
 
 jobs:
   update:
+    concurrency: ${{ inputs.test && github.run_id || 'update' }}
+
     name: Update ${{ github.workflow }}
     runs-on: windows-latest
     timeout-minutes: 20

diff --git a/.github/workflows/airserver.yml b/.github/workflows/airserver.yml
@@ -22,7 +22,7 @@ on:
       - update_vars.ps1
   schedule:
     - cron: 0 4 * * *   # Scheduled test
-    - cron: 5 0-23/6 * * * # Scheduled update
+    - cron: 5 */6 * * * # Scheduled update
   workflow_dispatch:    # Manual run
     inputs:
       type:
@@ -37,7 +37,7 @@ on:
 
 jobs:
   job:
-    name: ${{ fromJSON(format('{{"pull_request":"Test","push":"Update","schedule":"{0}","workflow_dispatch":"{1}"}}', fromJSON('{"0 4 * * *":"Test","5 0-23/6 * * *":"Update"}')[github.event.schedule], inputs.type))[github.event_name] }}
+    name: ${{ inputs.type || (github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *') && 'Test' || 'Update' }}
     uses: ./.github/workflows/.common.yml
     with:
       test: ${{ github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *' || inputs.type == 'Test' }}

diff --git a/.github/workflows/eclipse.yml b/.github/workflows/eclipse.yml
@@ -22,7 +22,7 @@ on:
       - update_vars.ps1
   schedule:
     - cron: 0 4 * * *   # Scheduled test
-    - cron: 15 0-23/6 * * * # Scheduled update
+    - cron: 5 */6 * * * # Scheduled update
   workflow_dispatch:    # Manual run
     inputs:
       type:
@@ -37,7 +37,7 @@ on:
 
 jobs:
   job:
-    name: ${{ fromJSON(format('{{"pull_request":"Test","push":"Update","schedule":"{0}","workflow_dispatch":"{1}"}}', fromJSON('{"0 4 * * *":"Test","15 0-23/6 * * *":"Update"}')[github.event.schedule], inputs.type))[github.event_name] }}
+    name: ${{ inputs.type || (github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *') && 'Test' || 'Update' }}
     uses: ./.github/workflows/.common.yml
     with:
       test: ${{ github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *' || inputs.type == 'Test' }}

diff --git a/.github/workflows/hashcheck.yml b/.github/workflows/hashcheck.yml
@@ -22,7 +22,7 @@ on:
       - update_vars.ps1
   schedule:
     - cron: 0 4 * * *   # Scheduled test
-    - cron: 25 0-23/6 * * * # Scheduled update
+    - cron: 5 */6 * * * # Scheduled update
   workflow_dispatch:    # Manual run
     inputs:
       type:
@@ -37,7 +37,7 @@ on:
 
 jobs:
   job:
-    name: ${{ fromJSON(format('{{"pull_request":"Test","push":"Update","schedule":"{0}","workflow_dispatch":"{1}"}}', fromJSON('{"0 4 * * *":"Test","25 0-23/6 * * *":"Update"}')[github.event.schedule], inputs.type))[github.event_name] }}
+    name: ${{ inputs.type || (github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *') && 'Test' || 'Update' }}
     uses: ./.github/workflows/.common.yml
     with:
       test: ${{ github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *' || inputs.type == 'Test' }}

diff --git a/.github/workflows/ilspy.yml b/.github/workflows/ilspy.yml
@@ -22,7 +22,7 @@ on:
       - update_vars.ps1
   schedule:
     - cron: 0 4 * * *   # Scheduled test
-    - cron: 35 0-23/6 * * * # Scheduled update
+    - cron: 5 */6 * * * # Scheduled update
   workflow_dispatch:    # Manual run
     inputs:
       type:
@@ -37,7 +37,7 @@ on:
 
 jobs:
   job:
-    name: ${{ fromJSON(format('{{"pull_request":"Test","push":"Update","schedule":"{0}","workflow_dispatch":"{1}"}}', fromJSON('{"0 4 * * *":"Test","35 0-23/6 * * *":"Update"}')[github.event.schedule], inputs.type))[github.event_name] }}
+    name: ${{ inputs.type || (github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *') && 'Test' || 'Update' }}
     uses: ./.github/workflows/.common.yml
     with:
       test: ${{ github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *' || inputs.type == 'Test' }}

diff --git a/.github/workflows/imdisk.yml b/.github/workflows/imdisk.yml
@@ -22,7 +22,7 @@ on:
       - update_vars.ps1
   schedule:
     - cron: 0 4 * * *   # Scheduled test
-    - cron: 45 0-23/6 * * * # Scheduled update
+    - cron: 5 */6 * * * # Scheduled update
   workflow_dispatch:    # Manual run
     inputs:
       type:
@@ -37,7 +37,7 @@ on:
 
 jobs:
   job:
-    name: ${{ fromJSON(format('{{"pull_request":"Test","push":"Update","schedule":"{0}","workflow_dispatch":"{1}"}}', fromJSON('{"0 4 * * *":"Test","45 0-23/6 * * *":"Update"}')[github.event.schedule], inputs.type))[github.event_name] }}
+    name: ${{ inputs.type || (github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *') && 'Test' || 'Update' }}
     uses: ./.github/workflows/.common.yml
     with:
       test: ${{ github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *' || inputs.type == 'Test' }}

diff --git a/.github/workflows/kodi.yml b/.github/workflows/kodi.yml
@@ -22,7 +22,7 @@ on:
       - update_vars.ps1
   schedule:
     - cron: 0 4 * * *   # Scheduled test
-    - cron: 55 0-23/6 * * * # Scheduled update
+    - cron: 5 */6 * * * # Scheduled update
   workflow_dispatch:    # Manual run
     inputs:
       type:
@@ -37,7 +37,7 @@ on:
 
 jobs:
   job:
-    name: ${{ fromJSON(format('{{"pull_request":"Test","push":"Update","schedule":"{0}","workflow_dispatch":"{1}"}}', fromJSON('{"0 4 * * *":"Test","55 0-23/6 * * *":"Update"}')[github.event.schedule], inputs.type))[github.event_name] }}
+    name: ${{ inputs.type || (github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *') && 'Test' || 'Update' }}
     uses: ./.github/workflows/.common.yml
     with:
       test: ${{ github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *' || inputs.type == 'Test' }}

diff --git a/.github/workflows/lavfilters.yml b/.github/workflows/lavfilters.yml
@@ -22,7 +22,7 @@ on:
       - update_vars.ps1
   schedule:
     - cron: 0 4 * * *   # Scheduled test
-    - cron: 5 1-23/6 * * * # Scheduled update
+    - cron: 5 */6 * * * # Scheduled update
   workflow_dispatch:    # Manual run
     inputs:
       type:
@@ -37,7 +37,7 @@ on:
 
 jobs:
   job:
-    name: ${{ fromJSON(format('{{"pull_request":"Test","push":"Update","schedule":"{0}","workflow_dispatch":"{1}"}}', fromJSON('{"0 4 * * *":"Test","5 1-23/6 * * *":"Update"}')[github.event.schedule], inputs.type))[github.event_name] }}
+    name: ${{ inputs.type || (github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *') && 'Test' || 'Update' }}
     uses: ./.github/workflows/.common.yml
     with:
       test: ${{ github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *' || inputs.type == 'Test' }}

diff --git a/.github/workflows/marble.yml b/.github/workflows/marble.yml
@@ -22,7 +22,7 @@ on:
       - update_vars.ps1
   schedule:
     - cron: 0 4 * * *   # Scheduled test
-    - cron: 15 1-23/6 * * * # Scheduled update
+    - cron: 5 */6 * * * # Scheduled update
   workflow_dispatch:    # Manual run
     inputs:
       type:
@@ -37,7 +37,7 @@ on:
 
 jobs:
   job:
-    name: ${{ fromJSON(format('{{"pull_request":"Test","push":"Update","schedule":"{0}","workflow_dispatch":"{1}"}}', fromJSON('{"0 4 * * *":"Test","15 1-23/6 * * *":"Update"}')[github.event.schedule], inputs.type))[github.event_name] }}
+    name: ${{ inputs.type || (github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *') && 'Test' || 'Update' }}
     uses: ./.github/workflows/.common.yml
     with:
       test: ${{ github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *' || inputs.type == 'Test' }}

diff --git a/.github/workflows/procexp.yml b/.github/workflows/procexp.yml
@@ -22,7 +22,7 @@ on:
       - update_vars.ps1
   schedule:
     - cron: 0 4 * * *   # Scheduled test
-    - cron: 25 1-23/6 * * * # Scheduled update
+    - cron: 5 */6 * * * # Scheduled update
   workflow_dispatch:    # Manual run
     inputs:
       type:
@@ -37,7 +37,7 @@ on:
 
 jobs:
   job:
-    name: ${{ fromJSON(format('{{"pull_request":"Test","push":"Update","schedule":"{0}","workflow_dispatch":"{1}"}}', fromJSON('{"0 4 * * *":"Test","25 1-23/6 * * *":"Update"}')[github.event.schedule], inputs.type))[github.event_name] }}
+    name: ${{ inputs.type || (github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *') && 'Test' || 'Update' }}
     uses: ./.github/workflows/.common.yml
     with:
       test: ${{ github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *' || inputs.type == 'Test' }}

diff --git a/.github/workflows/procmon.yml b/.github/workflows/procmon.yml
@@ -22,7 +22,7 @@ on:
       - update_vars.ps1
   schedule:
     - cron: 0 4 * * *   # Scheduled test
-    - cron: 35 1-23/6 * * * # Scheduled update
+    - cron: 5 */6 * * * # Scheduled update
   workflow_dispatch:    # Manual run
     inputs:
       type:
@@ -37,7 +37,7 @@ on:
 
 jobs:
   job:
-    name: ${{ fromJSON(format('{{"pull_request":"Test","push":"Update","schedule":"{0}","workflow_dispatch":"{1}"}}', fromJSON('{"0 4 * * *":"Test","35 1-23/6 * * *":"Update"}')[github.event.schedule], inputs.type))[github.event_name] }}
+    name: ${{ inputs.type || (github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *') && 'Test' || 'Update' }}
     uses: ./.github/workflows/.common.yml
     with:
       test: ${{ github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *' || inputs.type == 'Test' }}

diff --git a/.github/workflows/sabnzbd.yml b/.github/workflows/sabnzbd.yml
@@ -22,7 +22,7 @@ on:
       - update_vars.ps1
   schedule:
     - cron: 0 4 * * *   # Scheduled test
-    - cron: 45 1-23/6 * * * # Scheduled update
+    - cron: 5 */6 * * * # Scheduled update
   workflow_dispatch:    # Manual run
     inputs:
       type:
@@ -37,7 +37,7 @@ on:
 
 jobs:
   job:
-    name: ${{ fromJSON(format('{{"pull_request":"Test","push":"Update","schedule":"{0}","workflow_dispatch":"{1}"}}', fromJSON('{"0 4 * * *":"Test","45 1-23/6 * * *":"Update"}')[github.event.schedule], inputs.type))[github.event_name] }}
+    name: ${{ inputs.type || (github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *') && 'Test' || 'Update' }}
     uses: ./.github/workflows/.common.yml
     with:
       test: ${{ github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *' || inputs.type == 'Test' }}

diff --git a/.github/workflows/serviio.yml b/.github/workflows/serviio.yml
@@ -22,7 +22,7 @@ on:
       - update_vars.ps1
   schedule:
     - cron: 0 4 * * *   # Scheduled test
-    - cron: 55 1-23/6 * * * # Scheduled update
+    - cron: 5 */6 * * * # Scheduled update
   workflow_dispatch:    # Manual run
     inputs:
       type:
@@ -37,7 +37,7 @@ on:
 
 jobs:
   job:
-    name: ${{ fromJSON(format('{{"pull_request":"Test","push":"Update","schedule":"{0}","workflow_dispatch":"{1}"}}', fromJSON('{"0 4 * * *":"Test","55 1-23/6 * * *":"Update"}')[github.event.schedule], inputs.type))[github.event_name] }}
+    name: ${{ inputs.type || (github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *') && 'Test' || 'Update' }}
     uses: ./.github/workflows/.common.yml
     with:
       test: ${{ github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *' || inputs.type == 'Test' }}

diff --git a/.github/workflows/stellarium.yml b/.github/workflows/stellarium.yml
@@ -22,7 +22,7 @@ on:
       - update_vars.ps1
   schedule:
     - cron: 0 4 * * *   # Scheduled test
-    - cron: 5 2-23/6 * * * # Scheduled update
+    - cron: 5 */6 * * * # Scheduled update
   workflow_dispatch:    # Manual run
     inputs:
       type:
@@ -37,7 +37,7 @@ on:
 
 jobs:
   job:
-    name: ${{ fromJSON(format('{{"pull_request":"Test","push":"Update","schedule":"{0}","workflow_dispatch":"{1}"}}', fromJSON('{"0 4 * * *":"Test","5 2-23/6 * * *":"Update"}')[github.event.schedule], inputs.type))[github.event_name] }}
+    name: ${{ inputs.type || (github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *') && 'Test' || 'Update' }}
     uses: ./.github/workflows/.common.yml
     with:
       test: ${{ github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *' || inputs.type == 'Test' }}

diff --git a/.github/workflows/strawberryperl.yml b/.github/workflows/strawberryperl.yml
@@ -22,7 +22,7 @@ on:
       - update_vars.ps1
   schedule:
     - cron: 0 4 * * *   # Scheduled test
-    - cron: 15 2-23/6 * * * # Scheduled update
+    - cron: 5 */6 * * * # Scheduled update
   workflow_dispatch:    # Manual run
     inputs:
       type:
@@ -37,7 +37,7 @@ on:
 
 jobs:
   job:
-    name: ${{ fromJSON(format('{{"pull_request":"Test","push":"Update","schedule":"{0}","workflow_dispatch":"{1}"}}', fromJSON('{"0 4 * * *":"Test","15 2-23/6 * * *":"Update"}')[github.event.schedule], inputs.type))[github.event_name] }}
+    name: ${{ inputs.type || (github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *') && 'Test' || 'Update' }}
     uses: ./.github/workflows/.common.yml
     with:
       test: ${{ github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *' || inputs.type == 'Test' }}

diff --git a/.github/workflows/subtitleedit.yml b/.github/workflows/subtitleedit.yml
@@ -22,7 +22,7 @@ on:
       - update_vars.ps1
   schedule:
     - cron: 0 4 * * *   # Scheduled test
-    - cron: 25 2-23/6 * * * # Scheduled update
+    - cron: 5 */6 * * * # Scheduled update
   workflow_dispatch:    # Manual run
     inputs:
       type:
@@ -37,7 +37,7 @@ on:
 
 jobs:
   job:
-    name: ${{ fromJSON(format('{{"pull_request":"Test","push":"Update","schedule":"{0}","workflow_dispatch":"{1}"}}', fromJSON('{"0 4 * * *":"Test","25 2-23/6 * * *":"Update"}')[github.event.schedule], inputs.type))[github.event_name] }}
+    name: ${{ inputs.type || (github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *') && 'Test' || 'Update' }}
     uses: ./.github/workflows/.common.yml
     with:
       test: ${{ github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *' || inputs.type == 'Test' }}

diff --git a/.github/workflows/vscodium.yml b/.github/workflows/vscodium.yml
@@ -24,7 +24,7 @@ on:
       - update_vars.ps1
   schedule:
     - cron: 0 4 * * *   # Scheduled test
-    - cron: 35 2-23/6 * * * # Scheduled update
+    - cron: 5 */6 * * * # Scheduled update
   workflow_dispatch:    # Manual run
     inputs:
       type:
@@ -39,7 +39,7 @@ on:
 
 jobs:
   job:
-    name: ${{ fromJSON(format('{{"pull_request":"Test","push":"Update","schedule":"{0}","workflow_dispatch":"{1}"}}', fromJSON('{"0 4 * * *":"Test","35 2-23/6 * * *":"Update"}')[github.event.schedule], inputs.type))[github.event_name] }}
+    name: ${{ inputs.type || (github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *') && 'Test' || 'Update' }}
     uses: ./.github/workflows/.common.yml
     with:
       packages: vscodium, vscodium.install, vscodium.portable