From 86384a8fb3f85f1154415b5e717a5a470c6a11f9 Mon Sep 17 00:00:00 2001 From: Heinrich Klobuczek Date: Fri, 8 Jul 2022 11:06:28 -0800 Subject: [PATCH 1/4] TLS on jruby:latest --- .github/workflows/testkit.yml | 4 ++-- .../lib/testkit/backend/messages/requests/get_features.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/testkit.yml b/.github/workflows/testkit.yml index e6dc0539..2253039a 100644 --- a/.github/workflows/testkit.yml +++ b/.github/workflows/testkit.yml @@ -26,7 +26,7 @@ jobs: # max-parallel: 1 fail-fast: false matrix: - ruby: ['jruby:9.3.4.0', 'ruby:latest'] + ruby: ['jruby:9.3.5.0', 'ruby:latest'] steps: - uses: actions/checkout@v2 @@ -70,7 +70,7 @@ jobs: cd testkit # everything from --run-only-selected is to reduce the number of tests run in this # demonstation setup. In a real setup, you most likely don't want this. - python3 main.py --tests TESTKIT_TESTS STUB_TESTS TLS_TESTS + python3 main.py --tests TLS_TESTS # --configs 4.3-enterprise --run-only-selected tests.neo4j.datatypes.TestDataTypes.test_should_echo_back - name: Archive testkit artifacts diff --git a/testkit-backend/lib/testkit/backend/messages/requests/get_features.rb b/testkit-backend/lib/testkit/backend/messages/requests/get_features.rb index 770a64ab..e45c45fb 100644 --- a/testkit-backend/lib/testkit/backend/messages/requests/get_features.rb +++ b/testkit-backend/lib/testkit/backend/messages/requests/get_features.rb @@ -20,9 +20,9 @@ def process 'Feature:Bolt:4.3', 'Feature:Bolt:4.4', 'Feature:Impersonation', - # 'Feature:TLS:1.1', # TODO works for java, + 'Feature:TLS:1.1', # TODO works for java, 'Feature:TLS:1.2', - # 'Feature:TLS:1.3', # TODO works for java + 'Feature:TLS:1.3', # TODO works for java 'AuthorizationExpiredTreatment', # 'Optimization:ConnectionReuse', # disabled for java 'Optimization:EagerTransactionBegin', From af99ef53419afe4d0fa3deb2fbf8e52066449543 Mon Sep 17 00:00:00 2001 From: Heinrich Klobuczek Date: Fri, 8 Jul 2022 11:33:13 -0800 Subject: [PATCH 2/4] refactor --- .github/workflows/testkit.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/testkit.yml b/.github/workflows/testkit.yml index 2253039a..87ce2a60 100644 --- a/.github/workflows/testkit.yml +++ b/.github/workflows/testkit.yml @@ -19,14 +19,16 @@ jobs: testkit: # The type of runner that the job will run on runs-on: ubuntu-latest - continue-on-error: ${{ startsWith(matrix.ruby, 'ruby') }} + continue-on-error: ${{ matrix.ruby[0] == 'ruby' }} timeout-minutes: 60 strategy: # max-parallel: 1 fail-fast: false matrix: - ruby: ['jruby:9.3.5.0', 'ruby:latest'] + ruby: + - [jruby, 9.3.5.0] + - [ruby, latest] steps: - uses: actions/checkout@v2 @@ -61,7 +63,7 @@ jobs: - name: Run TestKit env: # to learn what these variables do, see https://github.com/neo4j-drivers/testkit - TESTKIT_DRIVER_BUILD_ARG_RUBY: ${{ matrix.ruby }} + TESTKIT_DRIVER_BUILD_ARG_RUBY: ${{ join(matrix.ruby, ':') }} TEST_DRIVER_NAME: ruby TEST_DRIVER_REPO: ${{ github.workspace }}/driver TEST_RUN_ALL_TESTS: "true" @@ -77,5 +79,5 @@ jobs: if: failure() uses: actions/upload-artifact@v2 with: - name: artifacts ${{ matrix.ruby }} + name: artifacts ${{ matrix.ruby[0] }} path: ${{ github.workspace }}/testkit/artifacts From c2dd268bfbd0bd036e3a58b562fc55b9137e5a58 Mon Sep 17 00:00:00 2001 From: Heinrich Klobuczek Date: Fri, 8 Jul 2022 11:41:17 -0800 Subject: [PATCH 3/4] refactor --- .github/workflows/testkit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testkit.yml b/.github/workflows/testkit.yml index 87ce2a60..becb62e2 100644 --- a/.github/workflows/testkit.yml +++ b/.github/workflows/testkit.yml @@ -27,7 +27,7 @@ jobs: fail-fast: false matrix: ruby: - - [jruby, 9.3.5.0] + - [jruby, latest] - [ruby, latest] steps: From 32127f6767ff745eed0bd1d9e50cdc20ea0510d5 Mon Sep 17 00:00:00 2001 From: Heinrich Klobuczek Date: Fri, 8 Jul 2022 14:07:15 -0800 Subject: [PATCH 4/4] Update get_features.rb --- .../lib/testkit/backend/messages/requests/get_features.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testkit-backend/lib/testkit/backend/messages/requests/get_features.rb b/testkit-backend/lib/testkit/backend/messages/requests/get_features.rb index e45c45fb..770a64ab 100644 --- a/testkit-backend/lib/testkit/backend/messages/requests/get_features.rb +++ b/testkit-backend/lib/testkit/backend/messages/requests/get_features.rb @@ -20,9 +20,9 @@ def process 'Feature:Bolt:4.3', 'Feature:Bolt:4.4', 'Feature:Impersonation', - 'Feature:TLS:1.1', # TODO works for java, + # 'Feature:TLS:1.1', # TODO works for java, 'Feature:TLS:1.2', - 'Feature:TLS:1.3', # TODO works for java + # 'Feature:TLS:1.3', # TODO works for java 'AuthorizationExpiredTreatment', # 'Optimization:ConnectionReuse', # disabled for java 'Optimization:EagerTransactionBegin',