From 3902ad179f5a5d1b6d3833d6262f73b00bc5dd50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20D=C3=A9moulins?= Date: Thu, 22 Jun 2023 12:59:55 +0200 Subject: [PATCH 1/3] Revert "Review scheduled updates" This reverts commit 3810e11fd6dbb510b4104dfe1699e2c4dd5b2859. --- .github/workflows/airserver.yml | 4 ++-- .github/workflows/eclipse.yml | 4 ++-- .github/workflows/hashcheck.yml | 4 ++-- .github/workflows/ilspy.yml | 4 ++-- .github/workflows/imdisk.yml | 4 ++-- .github/workflows/kodi.yml | 4 ++-- .github/workflows/lavfilters.yml | 4 ++-- .github/workflows/marble.yml | 4 ++-- .github/workflows/procexp.yml | 4 ++-- .github/workflows/procmon.yml | 4 ++-- .github/workflows/sabnzbd.yml | 4 ++-- .github/workflows/serviio.yml | 4 ++-- .github/workflows/stellarium.yml | 4 ++-- .github/workflows/strawberryperl.yml | 4 ++-- .github/workflows/subtitleedit.yml | 4 ++-- .github/workflows/vscodium.yml | 4 ++-- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/airserver.yml b/.github/workflows/airserver.yml index 45e90bbc..f94d56af 100644 --- 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: ${{ 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] }} 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 index e80f7fa1..08f1e724 100644 --- 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: ${{ 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] }} 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 index 1f929722..b33f1453 100644 --- 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: ${{ 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] }} 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 index 1f39b010..c42c338b 100644 --- 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: ${{ 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] }} 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 index bdae861b..449712fe 100644 --- 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: ${{ 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] }} 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 index 2e60d1dd..e4a56eed 100644 --- 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: ${{ 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] }} 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 index a67edb6f..188cdcd0 100644 --- 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: ${{ 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] }} 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 index 99adacf5..51234ae3 100644 --- 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: ${{ 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] }} 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 index ac81f777..83b8558b 100644 --- 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: ${{ 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] }} 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 index 71cb100e..f5319bcb 100644 --- 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: ${{ 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] }} 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 index 94b01755..6aecb519 100644 --- 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: ${{ 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] }} 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 index 8434a015..0aa8621d 100644 --- 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: ${{ 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] }} 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 index 4d1eb46e..67af8503 100644 --- 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: ${{ 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] }} 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 index c50acbcb..36f6cb69 100644 --- 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: ${{ 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] }} 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 index 82da6027..f139bf32 100644 --- 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: ${{ 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] }} 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 index f297dc90..1f04a410 100644 --- 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: ${{ 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] }} uses: ./.github/workflows/.common.yml with: packages: vscodium, vscodium.install, vscodium.portable From 0e156d0f37d7fedabf72f6a32a9186333d677f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20D=C3=A9moulins?= Date: Fri, 23 Jun 2023 00:39:47 +0200 Subject: [PATCH 2/3] Simplify CI & review concurrency --- .github/workflows/procexp.yml | 10 ++++++++++ .github/workflows/procmon.yml | 12 +++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.github/workflows/procexp.yml b/.github/workflows/procexp.yml index 83b8558b..5c717191 100644 --- a/.github/workflows/procexp.yml +++ b/.github/workflows/procexp.yml @@ -35,6 +35,16 @@ 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] }} diff --git a/.github/workflows/procmon.yml b/.github/workflows/procmon.yml index f5319bcb..63af050c 100644 --- a/.github/workflows/procmon.yml +++ b/.github/workflows/procmon.yml @@ -35,9 +35,19 @@ 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' }} From 735d399bba01376430c16721a7b44ad2e311de38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20D=C3=A9moulins?= Date: Fri, 23 Jun 2023 00:53:59 +0200 Subject: [PATCH 3/3] Test --- .github/workflows/.common.yml | 2 ++ .github/workflows/airserver.yml | 2 +- .github/workflows/eclipse.yml | 2 +- .github/workflows/hashcheck.yml | 2 +- .github/workflows/ilspy.yml | 2 +- .github/workflows/imdisk.yml | 2 +- .github/workflows/kodi.yml | 2 +- .github/workflows/lavfilters.yml | 2 +- .github/workflows/marble.yml | 2 +- .github/workflows/procexp.yml | 12 +----------- .github/workflows/procmon.yml | 10 ---------- .github/workflows/sabnzbd.yml | 2 +- .github/workflows/serviio.yml | 2 +- .github/workflows/stellarium.yml | 2 +- .github/workflows/strawberryperl.yml | 2 +- .github/workflows/subtitleedit.yml | 2 +- .github/workflows/vscodium.yml | 2 +- 17 files changed, 17 insertions(+), 35 deletions(-) diff --git a/.github/workflows/.common.yml b/.github/workflows/.common.yml index b6829b5f..9e2d52ee 100644 --- 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 index f94d56af..4c389b07 100644 --- 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 index 08f1e724..7a9caff0 100644 --- 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 index b33f1453..854ce478 100644 --- 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 index c42c338b..91877dac 100644 --- 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 index 449712fe..3a87b6be 100644 --- 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 index e4a56eed..a3f3bb32 100644 --- 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 index 188cdcd0..7a650669 100644 --- 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 index 51234ae3..09f49593 100644 --- 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 index 5c717191..4f024aeb 100644 --- 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 index 63af050c..01735222 100644 --- 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 index 6aecb519..2a0fdb39 100644 --- 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 index 0aa8621d..3ed73c20 100644 --- 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 index 67af8503..c8425630 100644 --- 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 index 36f6cb69..a2111b25 100644 --- 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 index f139bf32..913b2d49 100644 --- 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 index 1f04a410..0acc42ec 100644 --- 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