Merge pull request #50 from leszczuu/OP-266

updated build OS to ubuntu 22.04
BitBagCommerce · Apr 25, 2024 · 1f168f3 · 1f168f3
2 parents e6f9e93 + e955263
commit 1f168f3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
     tests:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
 
         name: "Sylius ${{ matrix.sylius }}, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MySQL ${{ matrix.mysql }}"
 
@@ -200,4 +200,4 @@ jobs:
                     SLACK_MESSAGE: ':x:'
                     SLACK_TITLE: Failed build on ${{ github.event.repository.name }} repository
                     SLACK_USERNAME: ${{ secrets.FAILED_BUILD_SLACK_USERNAME }}
-                    SLACK_WEBHOOK: ${{ secrets.FAILED_BUILD_SLACK_WEBHOOK }}
+                    SLACK_WEBHOOK: ${{ secrets.FAILED_BUILD_SLACK_WEBHOOK }}
diff --git a/composer.json b/composer.json
@@ -39,6 +39,9 @@
         "vimeo/psalm": "4.7.1 || ^5.0.0",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0"
     },
+    "conflict": {
+        "behat/mink-selenium2-driver": ">=1.7.0"
+    },
     "config": {
         "sort-packages": true,
         "allow-plugins": {