Merge pull request #3239 from guilherme-gm/ci-updates-2

Actions fixes and using "controller" for PRs
HerculesWS · Nov 19, 2023 · 7e62e65 · 7e62e65
2 parents b097666 + e0de07d
commit 7e62e65
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,6 +1,6 @@
 name: build
 
-on: [workflow_call, pull_request]
+on: workflow_call
 
 env:
   MYSQL_DATABASE: 'ragnarok'
@@ -32,7 +32,7 @@ jobs:
     # github.head_ref will stop previous runs in the same PR (if in a PR)
     # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
     concurrency:
-      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}-${{ matrix.LTO }}
+      group: build-${{ github.head_ref || github.run_id }}_${{ matrix.CC }}_${{ matrix.RENEWAL }}_${{ matrix.CLIENT_TYPE }}_${{ matrix.HTTPLIB }}_${{ matrix.SANITIZER }}_${{ matrix.PACKET_VERSION}}_${{ matrix.LTO }}
       cancel-in-progress: true
 
     container:

diff --git a/.github/workflows/clang15_test.yml b/.github/workflows/clang15_test.yml
@@ -1,6 +1,6 @@
 name: clang15_test
 
-on: [workflow_call, pull_request]
+on: workflow_call
 
 env:
   MYSQL_DATABASE: 'ragnarok'
@@ -28,7 +28,7 @@ jobs:
     # github.head_ref will stop previous runs in the same PR (if in a PR)
     # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
     concurrency:
-      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}
+      group: clang-15-${{ github.head_ref || github.run_id }}_${{ matrix.CC }}_${{ matrix.RENEWAL }}_${{ matrix.CLIENT_TYPE }}_${{ matrix.HTTPLIB }}_${{ matrix.SANITIZER }}_${{ matrix.PACKET_VERSION}}
       cancel-in-progress: true
 
     container:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -1,6 +1,6 @@
 name: "CodeQL"
 
-on: [workflow_call, pull_request]
+on: workflow_call
 
 jobs:
   analyze:
@@ -15,7 +15,7 @@ jobs:
     # github.head_ref will stop previous runs in the same PR (if in a PR)
     # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
     concurrency:
-      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.language }}
+      group: codeql-${{ github.head_ref || github.run_id }}_${{ matrix.language }}
       cancel-in-progress: true
 
     permissions:

diff --git a/.github/workflows/controller.yml b/.github/workflows/controller.yml
@@ -1,7 +1,6 @@
 name: controller
 
-on:
-  push:
+on: [push, pull_request]
 
 jobs:
   hwsapibot:

diff --git a/.github/workflows/gcc_test.yml b/.github/workflows/gcc_test.yml
@@ -1,6 +1,6 @@
 name: gcc_test
 
-on: [workflow_call, pull_request]
+on: workflow_call
 
 env:
   MYSQL_DATABASE: 'ragnarok'
@@ -28,7 +28,7 @@ jobs:
     # github.head_ref will stop previous runs in the same PR (if in a PR)
     # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
     concurrency:
-      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}
+      group: gcc_test-${{ github.head_ref || github.run_id }}_${{ matrix.CC }}_${{ matrix.RENEWAL }}_${{ matrix.CLIENT_TYPE }}_${{ matrix.HTTPLIB }}_${{ matrix.SANITIZER }}_${{ matrix.PACKET_VERSION}}
       cancel-in-progress: true
 
     container:

diff --git a/.github/workflows/gccold1.yml b/.github/workflows/gccold1.yml
@@ -1,6 +1,6 @@
 name: gcc_old1
 
-on: [workflow_call, pull_request]
+on: workflow_call
 
 env:
   MYSQL_DATABASE: 'ragnarok'
@@ -29,7 +29,7 @@ jobs:
     # github.head_ref will stop previous runs in the same PR (if in a PR)
     # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
     concurrency:
-      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}-${{ matrix.LTO }}
+      group: gccold1-${{ github.head_ref || github.run_id }}_${{ matrix.CC }}_${{ matrix.RENEWAL }}_${{ matrix.CLIENT_TYPE }}_${{ matrix.HTTPLIB }}_${{ matrix.SANITIZER }}_${{ matrix.PACKET_VERSION}}_${{ matrix.LTO }}
       cancel-in-progress: true
 
     container:

diff --git a/.github/workflows/gccold2.yml b/.github/workflows/gccold2.yml
@@ -1,6 +1,6 @@
 name: gcc_old2
 
-on: [workflow_call, pull_request]
+on: workflow_call
 
 env:
   MYSQL_DATABASE: 'ragnarok'
@@ -29,7 +29,7 @@ jobs:
     # github.head_ref will stop previous runs in the same PR (if in a PR)
     # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
     concurrency:
-      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}-${{ matrix.LTO }}
+      group: gccold2-${{ github.head_ref || github.run_id }}_${{ matrix.CC }}_${{ matrix.RENEWAL }}_${{ matrix.CLIENT_TYPE }}_${{ matrix.HTTPLIB }}_${{ matrix.SANITIZER }}_${{ matrix.PACKET_VERSION}}_${{ matrix.LTO }}
       cancel-in-progress: true
 
     container:

diff --git a/.github/workflows/gccold3.yml b/.github/workflows/gccold3.yml
@@ -1,6 +1,6 @@
 name: gcc_old3
 
-on: [workflow_call, pull_request]
+on: workflow_call
 
 env:
   MYSQL_DATABASE: 'ragnarok'
@@ -30,7 +30,7 @@ jobs:
     # github.head_ref will stop previous runs in the same PR (if in a PR)
     # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
     concurrency:
-      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}-${{ matrix.LTO }}
+      group: gccold3-${{ github.head_ref || github.run_id }}_${{ matrix.CC }}_${{ matrix.RENEWAL }}_${{ matrix.CLIENT_TYPE }}_${{ matrix.HTTPLIB }}_${{ matrix.SANITIZER }}_${{ matrix.PACKET_VERSION}}_${{ matrix.LTO }}
       cancel-in-progress: true
 
     container:

diff --git a/.github/workflows/gccsnapshot_test.yml b/.github/workflows/gccsnapshot_test.yml
@@ -1,6 +1,6 @@
 name: gccsnapshot_test
 
-on: [workflow_call, pull_request]
+on: workflow_call
 
 env:
   MYSQL_DATABASE: 'ragnarok'
@@ -28,7 +28,7 @@ jobs:
     # github.head_ref will stop previous runs in the same PR (if in a PR)
     # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
     concurrency:
-      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}
+      group: gccsnapshot_test-${{ github.head_ref || github.run_id }}_${{ matrix.CC }}_${{ matrix.RENEWAL }}_${{ matrix.CLIENT_TYPE }}_${{ matrix.HTTPLIB }}_${{ matrix.SANITIZER }}_${{ matrix.PACKET_VERSION}}
       cancel-in-progress: true
 
     container:

diff --git a/.github/workflows/mariadb.yml b/.github/workflows/mariadb.yml
@@ -1,6 +1,6 @@
 name: mariadb
 
-on: [workflow_call, pull_request]
+on: workflow_call
 
 env:
   MYSQL_DATABASE: 'ragnarok'
@@ -26,7 +26,7 @@ jobs:
     # github.head_ref will stop previous runs in the same PR (if in a PR)
     # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
     concurrency:
-      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}-${{ matrix.MYSQL }}
+      group: mariadb-${{ github.head_ref || github.run_id }}_${{ matrix.CC }}_${{ matrix.RENEWAL }}_${{ matrix.CLIENT_TYPE }}_${{ matrix.HTTPLIB }}_${{ matrix.SANITIZER }}_${{ matrix.PACKET_VERSION}}_${{ matrix.MYSQL }}
       cancel-in-progress: true
 
     container:

diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
@@ -1,6 +1,6 @@
 name: mysql
 
-on: [workflow_call, pull_request]
+on: workflow_call
 
 env:
   MYSQL_DATABASE: 'ragnarok'
@@ -26,7 +26,7 @@ jobs:
     # github.head_ref will stop previous runs in the same PR (if in a PR)
     # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
     concurrency:
-      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ matrix.CC }}-${{ matrix.RENEWAL }}-${{ matrix.CLIENT_TYPE }}-${{ matrix.HTTPLIB }}-${{ matrix.SANITIZER }}-${{ matrix.PACKET_VERSION}}-${{ matrix.MYSQL }}
+      group: mysql-${{ github.head_ref || github.run_id }}_${{ matrix.CC }}_${{ matrix.RENEWAL }}_${{ matrix.CLIENT_TYPE }}_${{ matrix.HTTPLIB }}_${{ matrix.SANITIZER }}_${{ matrix.PACKET_VERSION}}_${{ matrix.MYSQL }}
       cancel-in-progress: true
 
     container:

diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml
@@ -1,6 +1,6 @@
 name: tools
 
-on: [workflow_call, pull_request]
+on: workflow_call
 
 env:
   MYSQL_DATABASE: 'ragnarok'
@@ -16,7 +16,7 @@ jobs:
     # github.head_ref will stop previous runs in the same PR (if in a PR)
     # github.run_id is a fallback when outside a PR (e.g. every merge in master will run, and previous won't stop)
     concurrency:
-      group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+      group: tools-${{ github.head_ref || github.run_id }}
       cancel-in-progress: true
 
     container: