From 720650832953f173ccfc55b315e3e296afdcff9b Mon Sep 17 00:00:00 2001 From: Juliusz Sosinowicz Date: Mon, 6 May 2024 16:57:12 +0200 Subject: [PATCH 1/2] Don't use main.yml since it has a limit of 20 jobs --- .github/workflows/async.yml | 11 +++++- .github/workflows/curl.yml | 11 +++++- .github/workflows/docker-Espressif.yml | 11 +++++- .github/workflows/docker-OpenWrt.yml | 11 +++++- .github/workflows/haproxy.yml | 11 +++++- .github/workflows/hitch.yml | 11 +++++- .github/workflows/hostap.yml | 11 +++++- .github/workflows/krb5.yml | 11 +++++- .github/workflows/libssh2.yml | 11 +++++- .github/workflows/main.yml | 55 -------------------------- .github/workflows/memcached.yml | 11 +++++- .github/workflows/multi-arch.yml | 11 +++++- .github/workflows/multi-compiler.yml | 11 +++++- .github/workflows/nginx.yml | 11 +++++- .github/workflows/no-malloc.yml | 11 +++++- .github/workflows/ocsp.yml | 11 +++++- .github/workflows/openssh.yml | 11 +++++- .github/workflows/openvpn.yml | 11 +++++- .github/workflows/os-check.yml | 11 +++++- .github/workflows/packaging.yml | 11 +++++- .github/workflows/stunnel.yml | 11 +++++- .github/workflows/zephyr.yml | 11 +++++- 22 files changed, 210 insertions(+), 76 deletions(-) delete mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/async.yml b/.github/workflows/async.yml index 36f50265a7..e1699c1c54 100644 --- a/.github/workflows/async.yml +++ b/.github/workflows/async.yml @@ -1,7 +1,16 @@ name: Async Tests +# START OF COMMON SECTION on: - workflow_call: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +# END OF COMMON SECTION jobs: make_check: diff --git a/.github/workflows/curl.yml b/.github/workflows/curl.yml index 69840eb61d..d1ffb6f666 100644 --- a/.github/workflows/curl.yml +++ b/.github/workflows/curl.yml @@ -1,7 +1,16 @@ name: curl Test +# START OF COMMON SECTION on: - workflow_call: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +# END OF COMMON SECTION jobs: build_wolfssl: diff --git a/.github/workflows/docker-Espressif.yml b/.github/workflows/docker-Espressif.yml index 4990e92850..c2b6ff0ba9 100644 --- a/.github/workflows/docker-Espressif.yml +++ b/.github/workflows/docker-Espressif.yml @@ -1,6 +1,15 @@ name: Espressif examples tests +# START OF COMMON SECTION on: - workflow_call: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +# END OF COMMON SECTION jobs: espressif_latest: diff --git a/.github/workflows/docker-OpenWrt.yml b/.github/workflows/docker-OpenWrt.yml index 3c348b6278..c71b500a67 100644 --- a/.github/workflows/docker-OpenWrt.yml +++ b/.github/workflows/docker-OpenWrt.yml @@ -2,8 +2,17 @@ # there aren't any compatibility issues. Take a look at Docker/OpenWrt/README.md name: OpenWrt test +# START OF COMMON SECTION on: - workflow_call: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +# END OF COMMON SECTION jobs: build_library: diff --git a/.github/workflows/haproxy.yml b/.github/workflows/haproxy.yml index 9c7047bc24..43e197fd59 100644 --- a/.github/workflows/haproxy.yml +++ b/.github/workflows/haproxy.yml @@ -1,7 +1,16 @@ name: HaProxy Tests +# START OF COMMON SECTION on: - workflow_call: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +# END OF COMMON SECTION jobs: haproxy_check: diff --git a/.github/workflows/hitch.yml b/.github/workflows/hitch.yml index 13b933fd75..4f11a79f04 100644 --- a/.github/workflows/hitch.yml +++ b/.github/workflows/hitch.yml @@ -1,7 +1,16 @@ name: hitch Tests +# START OF COMMON SECTION on: - workflow_call: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +# END OF COMMON SECTION jobs: build_wolfssl: diff --git a/.github/workflows/hostap.yml b/.github/workflows/hostap.yml index 6e45126dbd..aad37cad30 100644 --- a/.github/workflows/hostap.yml +++ b/.github/workflows/hostap.yml @@ -1,7 +1,16 @@ name: hostap and wpa-supplicant Tests +# START OF COMMON SECTION on: - workflow_call: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +# END OF COMMON SECTION jobs: build_wolfssl: diff --git a/.github/workflows/krb5.yml b/.github/workflows/krb5.yml index 0022d64dde..87f89dba1c 100644 --- a/.github/workflows/krb5.yml +++ b/.github/workflows/krb5.yml @@ -1,7 +1,16 @@ name: Kerberos 5 Tests +# START OF COMMON SECTION on: - workflow_call: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +# END OF COMMON SECTION jobs: build_wolfssl: diff --git a/.github/workflows/libssh2.yml b/.github/workflows/libssh2.yml index dd9d50e63f..a66d1c5697 100644 --- a/.github/workflows/libssh2.yml +++ b/.github/workflows/libssh2.yml @@ -1,7 +1,16 @@ name: libssh2 Tests +# START OF COMMON SECTION on: - workflow_call: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +# END OF COMMON SECTION jobs: build_wolfssl: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index 8edb7a7f38..0000000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: CI -concurrency: - group: ${{ github.ref }} - cancel-in-progress: true - -on: - push: - branches: [ 'master', 'main', 'release/**' ] - pull_request: - branches: [ '*' ] - -jobs: - espressif: - uses: ./.github/workflows/docker-Espressif.yml - multi-compiler: - uses: ./.github/workflows/multi-compiler.yml - multi-arch: - uses: ./.github/workflows/multi-arch.yml - openwrt: - uses: ./.github/workflows/docker-OpenWrt.yml - os-check: - uses: ./.github/workflows/os-check.yml - async: - uses: ./.github/workflows/async.yml - stunnel: - uses: ./.github/workflows/stunnel.yml - openvpn: - uses: ./.github/workflows/openvpn.yml - hostap: - uses: ./.github/workflows/hostap.yml - nginx: - uses: ./.github/workflows/nginx.yml - zephyr: - uses: ./.github/workflows/zephyr.yml - hitch: - uses: ./.github/workflows/hitch.yml - curl: - uses: ./.github/workflows/curl.yml - krb5: - uses: ./.github/workflows/krb5.yml - packaging: - uses: ./.github/workflows/packaging.yml - memcached: - uses: ./.github/workflows/memcached.yml - libssh2: - uses: ./.github/workflows/libssh2.yml - openssh: - uses: ./.github/workflows/openssh.yml -# TODO: Currently this test fails. Enable it once it becomes passing. -# haproxy: -# uses: ./.github/workflows/haproxy.yml - ocsp: - uses: ./.github/workflows/ocsp.yml - no-malloc: - uses: ./.github/workflows/no-malloc.yml diff --git a/.github/workflows/memcached.yml b/.github/workflows/memcached.yml index fde37018d3..9bcedc149e 100644 --- a/.github/workflows/memcached.yml +++ b/.github/workflows/memcached.yml @@ -1,7 +1,16 @@ name: memcached Tests +# START OF COMMON SECTION on: - workflow_call: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +# END OF COMMON SECTION jobs: build_wolfssl: diff --git a/.github/workflows/multi-arch.yml b/.github/workflows/multi-arch.yml index 031ca802e8..f296464f9f 100644 --- a/.github/workflows/multi-arch.yml +++ b/.github/workflows/multi-arch.yml @@ -1,7 +1,16 @@ name: Multiple architectures +# START OF COMMON SECTION on: - workflow_call: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +# END OF COMMON SECTION jobs: my_matrix: diff --git a/.github/workflows/multi-compiler.yml b/.github/workflows/multi-compiler.yml index b63fd0f2f3..08e1e4e0db 100644 --- a/.github/workflows/multi-compiler.yml +++ b/.github/workflows/multi-compiler.yml @@ -1,7 +1,16 @@ name: Multiple compilers and versions +# START OF COMMON SECTION on: - workflow_call: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +# END OF COMMON SECTION jobs: my_matrix: diff --git a/.github/workflows/nginx.yml b/.github/workflows/nginx.yml index 9f9f81ec8d..97e57a1eea 100644 --- a/.github/workflows/nginx.yml +++ b/.github/workflows/nginx.yml @@ -1,7 +1,16 @@ name: nginx Tests +# START OF COMMON SECTION on: - workflow_call: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +# END OF COMMON SECTION jobs: build_wolfssl: diff --git a/.github/workflows/no-malloc.yml b/.github/workflows/no-malloc.yml index 70360fee69..88e5eedd70 100644 --- a/.github/workflows/no-malloc.yml +++ b/.github/workflows/no-malloc.yml @@ -1,7 +1,16 @@ name: No Malloc Tests +# START OF COMMON SECTION on: - workflow_call: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +# END OF COMMON SECTION jobs: make_check: diff --git a/.github/workflows/ocsp.yml b/.github/workflows/ocsp.yml index edfd2b6f89..3937b2e7f1 100644 --- a/.github/workflows/ocsp.yml +++ b/.github/workflows/ocsp.yml @@ -1,7 +1,16 @@ name: OCSP Test +# START OF COMMON SECTION on: - workflow_call: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +# END OF COMMON SECTION jobs: ocsp_stapling: diff --git a/.github/workflows/openssh.yml b/.github/workflows/openssh.yml index 0283877388..040ae74648 100644 --- a/.github/workflows/openssh.yml +++ b/.github/workflows/openssh.yml @@ -1,7 +1,16 @@ name: openssh Tests +# START OF COMMON SECTION on: - workflow_call: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +# END OF COMMON SECTION jobs: build_wolfssl: diff --git a/.github/workflows/openvpn.yml b/.github/workflows/openvpn.yml index bf05107b2f..97243cb9ea 100644 --- a/.github/workflows/openvpn.yml +++ b/.github/workflows/openvpn.yml @@ -1,7 +1,16 @@ name: OpenVPN Tests +# START OF COMMON SECTION on: - workflow_call: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +# END OF COMMON SECTION jobs: build_wolfssl: diff --git a/.github/workflows/os-check.yml b/.github/workflows/os-check.yml index 9846efaa19..4787363100 100644 --- a/.github/workflows/os-check.yml +++ b/.github/workflows/os-check.yml @@ -1,7 +1,16 @@ name: Ubuntu-Macos-Windows Tests +# START OF COMMON SECTION on: - workflow_call: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +# END OF COMMON SECTION jobs: make_check: diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 50f2a0863b..b4657110c5 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -1,7 +1,16 @@ name: Packaging Tests +# START OF COMMON SECTION on: - workflow_call: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +# END OF COMMON SECTION jobs: build_wolfssl: diff --git a/.github/workflows/stunnel.yml b/.github/workflows/stunnel.yml index a93a047744..5e1b6b325f 100644 --- a/.github/workflows/stunnel.yml +++ b/.github/workflows/stunnel.yml @@ -1,7 +1,16 @@ name: stunnel Tests +# START OF COMMON SECTION on: - workflow_call: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +# END OF COMMON SECTION jobs: build_wolfssl: diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index c7f1bc8ee3..44b8fa029f 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -1,7 +1,16 @@ name: Zephyr tests +# START OF COMMON SECTION on: - workflow_call: + push: + branches: [ 'master', 'main', 'release/**' ] + pull_request: + branches: [ '*' ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +# END OF COMMON SECTION jobs: run_test: From 2ffb5cc16c2081e9238aae4cf25c6f542c527003 Mon Sep 17 00:00:00 2001 From: Juliusz Sosinowicz Date: Tue, 7 May 2024 10:31:04 +0200 Subject: [PATCH 2/2] Move haproxy.yml to disabled directory --- .github/workflows/{ => disabled}/haproxy.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{ => disabled}/haproxy.yml (100%) diff --git a/.github/workflows/haproxy.yml b/.github/workflows/disabled/haproxy.yml similarity index 100% rename from .github/workflows/haproxy.yml rename to .github/workflows/disabled/haproxy.yml