From cd5f2e7918967acaa1527ab5736f1c44b45fd53b Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Thu, 15 May 2025 15:28:36 -0700 Subject: [PATCH 1/5] Fix for pr#123 failing ipmitool and grpc no WPFF --- .github/workflows/grpc.yml | 3 --- .github/workflows/ipmitool.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/.github/workflows/grpc.yml b/.github/workflows/grpc.yml index 20b399b9..2b6368f2 100644 --- a/.github/workflows/grpc.yml +++ b/.github/workflows/grpc.yml @@ -84,9 +84,6 @@ jobs: h2_ssl_cert_test h2_ssl_session_reuse_test wolfssl_ref: [ 'master', 'v5.7.4-stable' ] openssl_ref: [ 'openssl-3.2.0' ] - exclude: - - grpc_ref: 'master' - force_fail: 'WOLFPROV_FORCE_FAIL=1' steps: - name: Checkout wolfProvider uses: actions/checkout@v4 diff --git a/.github/workflows/ipmitool.yml b/.github/workflows/ipmitool.yml index accee2df..4f2f8895 100644 --- a/.github/workflows/ipmitool.yml +++ b/.github/workflows/ipmitool.yml @@ -77,9 +77,6 @@ jobs: ipmitool_ref: [ 'master', 'c3939dac2c060651361fc71516806f9ab8c38901' ] wolfssl_ref: [ 'master', 'v5.7.4-stable' ] openssl_ref: [ 'openssl-3.2.0' ] - exclude: - - ipmitool_ref: 'master' - force_fail: 'WOLFPROV_FORCE_FAIL=1' steps: - name: Retrieving OpenSSL from cache uses: actions/cache/restore@v4 From 296a14696264a49cfd627f5ba4a120b6118621fe Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Thu, 15 May 2025 15:40:14 -0700 Subject: [PATCH 2/5] Fix grpc ref format --- .github/workflows/grpc.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/grpc.yml b/.github/workflows/grpc.yml index 2b6368f2..b83e8ead 100644 --- a/.github/workflows/grpc.yml +++ b/.github/workflows/grpc.yml @@ -75,13 +75,14 @@ jobs: fail-fast: false matrix: include: - - grpc_ref: [ 'master', 'v1.60.0' ] - tests: >- - bad_ssl_alpn_test bad_ssl_cert_test client_ssl_test - crl_ssl_transport_security_test server_ssl_test - ssl_transport_security_test ssl_transport_security_utils_test - test_core_security_ssl_credentials_test test_cpp_end2end_ssl_credentials_test - h2_ssl_cert_test h2_ssl_session_reuse_test + - grpc_ref: 'v1.60.0' + - grpc_ref: 'master' + tests: >- + bad_ssl_alpn_test bad_ssl_cert_test client_ssl_test + crl_ssl_transport_security_test server_ssl_test + ssl_transport_security_test ssl_transport_security_utils_test + test_core_security_ssl_credentials_test test_cpp_end2end_ssl_credentials_test + h2_ssl_cert_test h2_ssl_session_reuse_test wolfssl_ref: [ 'master', 'v5.7.4-stable' ] openssl_ref: [ 'openssl-3.2.0' ] steps: From 34e0b8880e111b8f100daf6040db08d5c82ff6b9 Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Thu, 15 May 2025 15:53:21 -0700 Subject: [PATCH 3/5] Make the list pure matrix --- .github/workflows/grpc.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/grpc.yml b/.github/workflows/grpc.yml index b83e8ead..ecd50587 100644 --- a/.github/workflows/grpc.yml +++ b/.github/workflows/grpc.yml @@ -74,15 +74,13 @@ jobs: strategy: fail-fast: false matrix: - include: - - grpc_ref: 'v1.60.0' - - grpc_ref: 'master' - tests: >- - bad_ssl_alpn_test bad_ssl_cert_test client_ssl_test - crl_ssl_transport_security_test server_ssl_test - ssl_transport_security_test ssl_transport_security_utils_test - test_core_security_ssl_credentials_test test_cpp_end2end_ssl_credentials_test - h2_ssl_cert_test h2_ssl_session_reuse_test + grpc_ref: [ 'v1.60.0', 'master' ] + tests: [ 'bad_ssl_alpn_test', 'bad_ssl_cert_test', 'client_ssl_test', + 'crl_ssl_transport_security_test', 'server_ssl_test', + 'ssl_transport_security_test', 'ssl_transport_security_utils_test', + 'test_core_security_ssl_credentials_test', + 'test_cpp_end2end_ssl_credentials_test', 'h2_ssl_cert_test', + 'h2_ssl_session_reuse_test' ] wolfssl_ref: [ 'master', 'v5.7.4-stable' ] openssl_ref: [ 'openssl-3.2.0' ] steps: From 677b1a5313b3f4628ab239fbf11fa5d7f4d6375a Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Thu, 15 May 2025 16:08:50 -0700 Subject: [PATCH 4/5] Have to seperate test strings are ref labels --- .github/workflows/grpc.yml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/grpc.yml b/.github/workflows/grpc.yml index ecd50587..33d45aec 100644 --- a/.github/workflows/grpc.yml +++ b/.github/workflows/grpc.yml @@ -74,13 +74,21 @@ jobs: strategy: fail-fast: false matrix: - grpc_ref: [ 'v1.60.0', 'master' ] - tests: [ 'bad_ssl_alpn_test', 'bad_ssl_cert_test', 'client_ssl_test', - 'crl_ssl_transport_security_test', 'server_ssl_test', - 'ssl_transport_security_test', 'ssl_transport_security_utils_test', - 'test_core_security_ssl_credentials_test', - 'test_cpp_end2end_ssl_credentials_test', 'h2_ssl_cert_test', - 'h2_ssl_session_reuse_test' ] + include: + - grpc_ref: 'v1.60.0' + tests: >- + bad_ssl_alpn_test bad_ssl_cert_test client_ssl_test + crl_ssl_transport_security_test server_ssl_test + ssl_transport_security_test ssl_transport_security_utils_test + test_core_security_ssl_credentials_test test_cpp_end2end_ssl_credentials_test + h2_ssl_cert_test h2_ssl_session_reuse_test + - grpc_ref: 'master' + tests: >- + bad_ssl_alpn_test bad_ssl_cert_test client_ssl_test + crl_ssl_transport_security_test server_ssl_test + ssl_transport_security_test ssl_transport_security_utils_test + test_core_security_ssl_credentials_test test_cpp_end2end_ssl_credentials_test + h2_ssl_cert_test h2_ssl_session_reuse_test wolfssl_ref: [ 'master', 'v5.7.4-stable' ] openssl_ref: [ 'openssl-3.2.0' ] steps: From edf053b9b849078c3aaf338cd8fb3d37e4d8ef00 Mon Sep 17 00:00:00 2001 From: Aidan Garske Date: Thu, 15 May 2025 16:37:54 -0700 Subject: [PATCH 5/5] Revert back to stable version master has different test versions --- .github/workflows/grpc.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/grpc.yml b/.github/workflows/grpc.yml index 33d45aec..eace9bf2 100644 --- a/.github/workflows/grpc.yml +++ b/.github/workflows/grpc.yml @@ -75,14 +75,7 @@ jobs: fail-fast: false matrix: include: - - grpc_ref: 'v1.60.0' - tests: >- - bad_ssl_alpn_test bad_ssl_cert_test client_ssl_test - crl_ssl_transport_security_test server_ssl_test - ssl_transport_security_test ssl_transport_security_utils_test - test_core_security_ssl_credentials_test test_cpp_end2end_ssl_credentials_test - h2_ssl_cert_test h2_ssl_session_reuse_test - - grpc_ref: 'master' + - grpc_ref: v1.60.0 # TODO: Add master tests: >- bad_ssl_alpn_test bad_ssl_cert_test client_ssl_test crl_ssl_transport_security_test server_ssl_test