Test

Thilas · Jun 22, 2023 · 735d399 · 735d399
1 parent 0e156d0
commit 735d399
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 35 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
@@ -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 */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
@@ -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 */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
@@ -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 */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
@@ -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 */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
@@ -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 */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
@@ -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 */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
@@ -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 */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
@@ -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 */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
@@ -35,19 +35,9 @@ on:
           - Test
           - Update
 
-# Test:
-# - github.event_name == 'pull_request'
-# - github.event_name == 'schedule' && github.event.schedule = '0 4 * * *'
-# - github.event_name == 'workflow_dispatch' && inputs.type == 'Test'
-# Update:
-# - github.event_name == 'push'
-# - github.event_name == 'schedule' && github.event.schedule = '5 */6 * * *'
-# - github.event_name == 'workflow_dispatch' && inputs.type == ''
-concurrency: ${{ (github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *' || inputs.type == 'Test') && 'github.run_id' || 'update' }}
-
 jobs:
   job:
-    name: ${{ fromJSON(format('{{"pull_request":"Test","push":"Update","schedule":"{0}","workflow_dispatch":"{1}"}}', fromJSON('{"0 4 * * *":"Test","5 */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
@@ -35,16 +35,6 @@ on:
           - Test
           - Update
 
-# Test:
-# - github.event_name == 'pull_request'
-# - github.event_name == 'schedule' && github.event.schedule = '0 4 * * *'
-# - github.event_name == 'workflow_dispatch' && inputs.type == 'Test'
-# Update:
-# - github.event_name == 'push'
-# - github.event_name == 'schedule' && github.event.schedule = '5 */6 * * *'
-# - github.event_name == 'workflow_dispatch' && inputs.type == ''
-concurrency: ${{ (github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *' || inputs.type == 'Test') && 'github.run_id' || 'update' }}
-
 jobs:
   job:
     name: ${{ inputs.type || (github.event_name == 'pull_request' || github.event.schedule == '0 4 * * *') && 'Test' || 'Update' }}

diff --git a/.github/workflows/sabnzbd.yml b/.github/workflows/sabnzbd.yml
@@ -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 */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
@@ -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 */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
@@ -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 */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
@@ -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 */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
@@ -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 */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
@@ -39,7 +39,7 @@ on:
 
 jobs:
   job:
-    name: ${{ fromJSON(format('{{"pull_request":"Test","push":"Update","schedule":"{0}","workflow_dispatch":"{1}"}}', fromJSON('{"0 4 * * *":"Test","5 */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