From 37e9ae6bf1f8fec4199c3fb77f85c55edd160966 Mon Sep 17 00:00:00 2001 From: Killesreiter Volker Date: Tue, 13 Aug 2024 09:05:13 +0200 Subject: [PATCH 01/22] set w3c false --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b2a699ae0..cce65bfee 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,7 +26,7 @@ env: DRUPAL_TESTING_SELENIUM_PORT: 9515 PHPSTAN_MEMORY_LIMIT: 4G DRUPAL_TESTING_PARALLEL_TESTING: false - MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","chromeOptions":{"args":["--disable-gpu","--headless", "--no-sandbox", "--disable-dev-shm-usage"]}}, "http://127.0.0.1:9515"]' + MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","chromeOptions":{"w3c" => false, "args":["--disable-gpu","--headless", "--no-sandbox", "--disable-dev-shm-usage"]}}, "http://127.0.0.1:9515"]' SIMPLETEST_BASE_URL: http://thunder-testing:8888 SKIP_TEST_CLEANUP: true # The following variable set the version that the upgrade test starts with. From 129a0a0e77827b6378d5d7919678fd0ae92f8971 Mon Sep 17 00:00:00 2001 From: Killesreiter Volker Date: Tue, 13 Aug 2024 09:40:51 +0200 Subject: [PATCH 02/22] no dump file --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cce65bfee..e0974acfe 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,6 @@ env: DRUPAL_TESTING_COMPOSER_PROJECT_VERSION: "^4.0@stable" DRUPAL_TESTING_DATABASE_USER: root DRUPAL_TESTING_DATABASE_PASSWORD: root - DRUPAL_TESTING_TEST_DUMP_FILE: site-dump.tar.gz DRUPAL_TESTING_DATABASE_ENGINE: mysql DRUPAL_TESTING_TEST_CODING_STYLES: false DRUPAL_TESTING_TEST_PROFILE: thunder From ca1c2e85521904b9d77666e61ed53753bd0295eb Mon Sep 17 00:00:00 2001 From: Killesreiter Volker Date: Tue, 13 Aug 2024 09:43:22 +0200 Subject: [PATCH 03/22] Revert "set w3c false" This reverts commit 37e9ae6bf1f8fec4199c3fb77f85c55edd160966. --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e0974acfe..12a76fde2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,7 +25,7 @@ env: DRUPAL_TESTING_SELENIUM_PORT: 9515 PHPSTAN_MEMORY_LIMIT: 4G DRUPAL_TESTING_PARALLEL_TESTING: false - MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","chromeOptions":{"w3c" => false, "args":["--disable-gpu","--headless", "--no-sandbox", "--disable-dev-shm-usage"]}}, "http://127.0.0.1:9515"]' + MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","chromeOptions":{"args":["--disable-gpu","--headless", "--no-sandbox", "--disable-dev-shm-usage"]}}, "http://127.0.0.1:9515"]' SIMPLETEST_BASE_URL: http://thunder-testing:8888 SKIP_TEST_CLEANUP: true # The following variable set the version that the upgrade test starts with. From 9e3b3900406f41c95161a2839727a0352555a8a3 Mon Sep 17 00:00:00 2001 From: Killesreiter Volker Date: Tue, 13 Aug 2024 10:11:40 +0200 Subject: [PATCH 04/22] use core 10.3.1 --- .github/workflows/test.yml | 3 ++- composer.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 12a76fde2..cce65bfee 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,6 +14,7 @@ env: DRUPAL_TESTING_COMPOSER_PROJECT_VERSION: "^4.0@stable" DRUPAL_TESTING_DATABASE_USER: root DRUPAL_TESTING_DATABASE_PASSWORD: root + DRUPAL_TESTING_TEST_DUMP_FILE: site-dump.tar.gz DRUPAL_TESTING_DATABASE_ENGINE: mysql DRUPAL_TESTING_TEST_CODING_STYLES: false DRUPAL_TESTING_TEST_PROFILE: thunder @@ -25,7 +26,7 @@ env: DRUPAL_TESTING_SELENIUM_PORT: 9515 PHPSTAN_MEMORY_LIMIT: 4G DRUPAL_TESTING_PARALLEL_TESTING: false - MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","chromeOptions":{"args":["--disable-gpu","--headless", "--no-sandbox", "--disable-dev-shm-usage"]}}, "http://127.0.0.1:9515"]' + MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","chromeOptions":{"w3c" => false, "args":["--disable-gpu","--headless", "--no-sandbox", "--disable-dev-shm-usage"]}}, "http://127.0.0.1:9515"]' SIMPLETEST_BASE_URL: http://thunder-testing:8888 SKIP_TEST_CLEANUP: true # The following variable set the version that the upgrade test starts with. diff --git a/composer.json b/composer.json index a5d402f6a..3b301bb55 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,7 @@ "drupal/autosave_form": "^1.6", "drupal/blazy": "^2.14", "drupal/checklistapi": "^2.1", - "drupal/core-recommended": "~10.3.0@stable", + "drupal/core-recommended": "10.3.1", "drupal/config_selector": "^2.1", "drupal/config_update": "^1.7 || ^2.0", "drupal/content_lock": "^2.1", From f1a9f843011fec02eceedb4bf64bfcf7ce2511b7 Mon Sep 17 00:00:00 2001 From: Killesreiter Volker Date: Tue, 13 Aug 2024 10:13:02 +0200 Subject: [PATCH 05/22] remove w3c flag --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cce65bfee..b2a699ae0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,7 +26,7 @@ env: DRUPAL_TESTING_SELENIUM_PORT: 9515 PHPSTAN_MEMORY_LIMIT: 4G DRUPAL_TESTING_PARALLEL_TESTING: false - MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","chromeOptions":{"w3c" => false, "args":["--disable-gpu","--headless", "--no-sandbox", "--disable-dev-shm-usage"]}}, "http://127.0.0.1:9515"]' + MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","chromeOptions":{"args":["--disable-gpu","--headless", "--no-sandbox", "--disable-dev-shm-usage"]}}, "http://127.0.0.1:9515"]' SIMPLETEST_BASE_URL: http://thunder-testing:8888 SKIP_TEST_CLEANUP: true # The following variable set the version that the upgrade test starts with. From 783e971a408193e181f8377a642e9fe9ba9deea1 Mon Sep 17 00:00:00 2001 From: Killesreiter Volker Date: Tue, 13 Aug 2024 11:11:46 +0200 Subject: [PATCH 06/22] pin selenium driver --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3b301bb55..818690e63 100644 --- a/composer.json +++ b/composer.json @@ -117,7 +117,8 @@ "caxy/php-htmldiff": "^0.1.14", "webonyx/graphql-php": "^14.11.8", "drupal/jquery_ui": "^1.6", - "drupal/jquery_ui_draggable": "^2.1" + "drupal/jquery_ui_draggable": "^2.1", + "lullabot/mink-selenium2-driver": "v1.7.3" }, "suggest": { "drupal/search_api_solr": "Provides a Apache Solr backend for the Search API module" From 2bf9efb03736cba9bf243a8b8b861d35ac3d0f07 Mon Sep 17 00:00:00 2001 From: Killesreiter Volker Date: Tue, 13 Aug 2024 11:26:20 +0200 Subject: [PATCH 07/22] revert and tmate --- .github/workflows/test.yml | 3 +++ composer.json | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b2a699ae0..a6eafa2a3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -162,6 +162,9 @@ jobs: site-directory: /tmp/test/thunder/install/docroot http-port: ${{ env.DRUPAL_TESTING_HTTP_PORT }} + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + - name: Run tests run: test-drupal-project run_tests env: diff --git a/composer.json b/composer.json index 818690e63..a5d402f6a 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,7 @@ "drupal/autosave_form": "^1.6", "drupal/blazy": "^2.14", "drupal/checklistapi": "^2.1", - "drupal/core-recommended": "10.3.1", + "drupal/core-recommended": "~10.3.0@stable", "drupal/config_selector": "^2.1", "drupal/config_update": "^1.7 || ^2.0", "drupal/content_lock": "^2.1", @@ -117,8 +117,7 @@ "caxy/php-htmldiff": "^0.1.14", "webonyx/graphql-php": "^14.11.8", "drupal/jquery_ui": "^1.6", - "drupal/jquery_ui_draggable": "^2.1", - "lullabot/mink-selenium2-driver": "v1.7.3" + "drupal/jquery_ui_draggable": "^2.1" }, "suggest": { "drupal/search_api_solr": "Provides a Apache Solr backend for the Search API module" From 1577e3d849e7dfe9e0e28a7f8f84ec0b20a5d00b Mon Sep 17 00:00:00 2001 From: Killesreiter Volker Date: Tue, 13 Aug 2024 14:43:04 +0200 Subject: [PATCH 08/22] use newer runner image --- .github/workflows/test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a6eafa2a3..853242c9a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,7 +38,7 @@ jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 services: mysql: @@ -106,7 +106,7 @@ jobs: test-max: needs: build - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 services: mysql: @@ -162,8 +162,8 @@ jobs: site-directory: /tmp/test/thunder/install/docroot http-port: ${{ env.DRUPAL_TESTING_HTTP_PORT }} - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 +# - name: Setup tmate session +# uses: mxschmitt/action-tmate@v3 - name: Run tests run: test-drupal-project run_tests @@ -173,7 +173,7 @@ jobs: test-upgrade: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 services: mysql: @@ -284,7 +284,7 @@ jobs: test-min: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 services: mysql: From 4dd992bec34526673d3fceeb185ef2d0434afa3d Mon Sep 17 00:00:00 2001 From: Killesreiter Volker Date: Tue, 13 Aug 2024 16:24:34 +0200 Subject: [PATCH 09/22] trigger From 32b27c25c3454eba43ce94a3745bc3e65ccadab8 Mon Sep 17 00:00:00 2001 From: Killesreiter Volker Date: Tue, 13 Aug 2024 16:37:51 +0200 Subject: [PATCH 10/22] try docker logs --- .github/workflows/test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 853242c9a..d3c7c2040 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -166,7 +166,9 @@ jobs: # uses: mxschmitt/action-tmate@v3 - name: Run tests - run: test-drupal-project run_tests + run: | + test-drupal-project run_tests + docker logs ${{ job.services.chrome.id } env: THUNDER_TEST_CHUNK: ${{ matrix.CHUNK }} DRUPAL_TESTING_TEST_PATH: /tmp/test/thunder/install/docroot/profiles/contrib/thunder/tests/src/TestSuites/ThunderTestSuite.php From 968e968098d80b5933e5847ea9f9161257619f9a Mon Sep 17 00:00:00 2001 From: Killesreiter Volker Date: Wed, 14 Aug 2024 08:05:24 +0200 Subject: [PATCH 11/22] move workflow file --- .github/workflows/{test.yml => tests.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{test.yml => tests.yml} (100%) diff --git a/.github/workflows/test.yml b/.github/workflows/tests.yml similarity index 100% rename from .github/workflows/test.yml rename to .github/workflows/tests.yml From 104d6b848db682b816e1c4b935b30c75e7fa7050 Mon Sep 17 00:00:00 2001 From: Killesreiter Volker Date: Wed, 14 Aug 2024 08:20:42 +0200 Subject: [PATCH 12/22] fix workflow file --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d3c7c2040..7be07d291 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -168,7 +168,7 @@ jobs: - name: Run tests run: | test-drupal-project run_tests - docker logs ${{ job.services.chrome.id } + docker logs ${{ job.services.chrome.id }} env: THUNDER_TEST_CHUNK: ${{ matrix.CHUNK }} DRUPAL_TESTING_TEST_PATH: /tmp/test/thunder/install/docroot/profiles/contrib/thunder/tests/src/TestSuites/ThunderTestSuite.php From 50b7ffaef04abca37abcebc2c4727eff134b1aaa Mon Sep 17 00:00:00 2001 From: Killesreiter Volker Date: Wed, 14 Aug 2024 08:44:48 +0200 Subject: [PATCH 13/22] remove docker logs --- .github/workflows/tests.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7be07d291..853242c9a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -166,9 +166,7 @@ jobs: # uses: mxschmitt/action-tmate@v3 - name: Run tests - run: | - test-drupal-project run_tests - docker logs ${{ job.services.chrome.id }} + run: test-drupal-project run_tests env: THUNDER_TEST_CHUNK: ${{ matrix.CHUNK }} DRUPAL_TESTING_TEST_PATH: /tmp/test/thunder/install/docroot/profiles/contrib/thunder/tests/src/TestSuites/ThunderTestSuite.php From 27bb05eefab728150a91f886f1aec3feb95e64fd Mon Sep 17 00:00:00 2001 From: Killesreiter Volker Date: Wed, 14 Aug 2024 09:24:32 +0200 Subject: [PATCH 14/22] trigger From ab726ec0c662383e7d741021fde1ab6872faca9b Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Wed, 14 Aug 2024 09:43:33 +0200 Subject: [PATCH 15/22] Update tests.yml --- .github/workflows/tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 853242c9a..8dec3a546 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -162,9 +162,6 @@ jobs: site-directory: /tmp/test/thunder/install/docroot http-port: ${{ env.DRUPAL_TESTING_HTTP_PORT }} -# - name: Setup tmate session -# uses: mxschmitt/action-tmate@v3 - - name: Run tests run: test-drupal-project run_tests env: From 724f30b27947d3d58c194c779da335695baf1e1c Mon Sep 17 00:00:00 2001 From: Daniel Bosen Date: Wed, 14 Aug 2024 10:45:45 +0200 Subject: [PATCH 16/22] empty From b76ce430f99284cb91bc219210d8f116a0630a46 Mon Sep 17 00:00:00 2001 From: Killesreiter Volker Date: Wed, 14 Aug 2024 12:00:56 +0200 Subject: [PATCH 17/22] tomate --- .github/workflows/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8dec3a546..374d65fee 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -88,6 +88,9 @@ jobs: - name: Build the docroot run: test-drupal-project build + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + - name: Test for deprecations run: test-drupal-project deprecation From 92bba18ad3b8d31c0038cdb94e7ca9f10f9f1a5a Mon Sep 17 00:00:00 2001 From: Killesreiter Volker Date: Wed, 14 Aug 2024 12:02:10 +0200 Subject: [PATCH 18/22] put tomate before build --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 374d65fee..bf64e1946 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -85,12 +85,12 @@ jobs: - name: Prepare the build run: test-drupal-project prepare_build - - name: Build the docroot - run: test-drupal-project build - - name: Setup tmate session uses: mxschmitt/action-tmate@v3 + - name: Build the docroot + run: test-drupal-project build + - name: Test for deprecations run: test-drupal-project deprecation From 3aad360c68907cfd95cb46332a0890550152e9c4 Mon Sep 17 00:00:00 2001 From: Killesreiter Volker Date: Wed, 14 Aug 2024 12:22:29 +0200 Subject: [PATCH 19/22] remove tomate --- .github/workflows/tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bf64e1946..8dec3a546 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -85,9 +85,6 @@ jobs: - name: Prepare the build run: test-drupal-project prepare_build - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - - name: Build the docroot run: test-drupal-project build From b0516da0ef87a012f9c82e0b282025629723c053 Mon Sep 17 00:00:00 2001 From: Killesreiter Volker Date: Wed, 14 Aug 2024 12:39:08 +0200 Subject: [PATCH 20/22] trigger From 27b9ce93abd5ed5ce0c13a8305a215a4593ac089 Mon Sep 17 00:00:00 2001 From: Killesreiter Volker Date: Wed, 14 Aug 2024 12:51:41 +0200 Subject: [PATCH 21/22] fix min requirements --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index a5d402f6a..6dc5931a5 100644 --- a/composer.json +++ b/composer.json @@ -67,7 +67,7 @@ "drupal/diff": "1.7", "drupal/dropzonejs": "^2.8", "drupal/empty_fields": "^1.0-alpha1", - "drupal/entity_reference_actions": "^1.1", + "drupal/entity_reference_actions": "~1.1.1", "drupal/entity_reference_revisions": "^1.3", "drupal/field_group": "^3.4", "drupal/focal_point": "^2.1", @@ -84,7 +84,7 @@ "drupal/media_entity_slideshow": "^2.0-alpha1", "drupal/media_entity_twitter": "^2.5", "drupal/media_expire": "^2.6", - "drupal/media_library_media_modify": "^1.0.0-beta16", + "drupal/media_library_media_modify": "~1.0.0", "drupal/media_file_delete": "^1.2", "drupal/metatag": "^1.26", "drupal/metatag_async_widget": "^1.0-alpha2", From 79466efba6185c64566c6b51bd668e3c6608ee17 Mon Sep 17 00:00:00 2001 From: Killesreiter Volker Date: Wed, 14 Aug 2024 13:29:06 +0200 Subject: [PATCH 22/22] use carets --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 6dc5931a5..cff7bf130 100644 --- a/composer.json +++ b/composer.json @@ -67,7 +67,7 @@ "drupal/diff": "1.7", "drupal/dropzonejs": "^2.8", "drupal/empty_fields": "^1.0-alpha1", - "drupal/entity_reference_actions": "~1.1.1", + "drupal/entity_reference_actions": "^1.1.1", "drupal/entity_reference_revisions": "^1.3", "drupal/field_group": "^3.4", "drupal/focal_point": "^2.1", @@ -84,7 +84,7 @@ "drupal/media_entity_slideshow": "^2.0-alpha1", "drupal/media_entity_twitter": "^2.5", "drupal/media_expire": "^2.6", - "drupal/media_library_media_modify": "~1.0.0", + "drupal/media_library_media_modify": "^1.0.0", "drupal/media_file_delete": "^1.2", "drupal/metatag": "^1.26", "drupal/metatag_async_widget": "^1.0-alpha2",