Merge branch 'main' into bugfix/FAHU/make-vault-migration-compatible-with-disabled-paypal-module

Author: candemiralp

.github/Makefile

@@ -15,7 +15,7 @@ magento:
 install:
 	composer config --json repositories.local '{"type": "path", "url": "/data/extensions/workdir", "options": { "symlink": false } }'
 	composer require "adyen/module-payment:*"
-	vendor/bin/phpcs --standard=Magento2 --extensions=php,phtml --error-severity=10 --ignore-annotations -n -p vendor/adyen/module-payment
+	vendor/bin/phpcs --standard=Magento2 --extensions=php,phtml --error-severity=10 -n -p vendor/adyen/module-payment
 	bin/magento module:enable Adyen_Payment
 	bin/magento setup:upgrade
 	bin/magento setup:di:compile

.github/codeql-config.yml

@@ -0,0 +1,2 @@
+paths-ignore:
+  - 'view/base/web/js'

.github/workflows/codeql.yml

@@ -2,13 +2,13 @@ name: "CodeQL"
 
 on:
   pull_request:
-    paths-ignore:
-      - 'view/base/web/js/**'
+  workflow_dispatch:
 
 jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
+    timeout-minutes: 25
     permissions:
       actions: read
       contents: read
@@ -24,15 +24,13 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           queries: +security-and-quality
-
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+          config-file: ./.github/codeql-config.yml
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{ matrix.language }}"

.github/workflows/create-release.yml

@@ -29,6 +29,7 @@ jobs:
       contents: write
       pull-requests: write
     runs-on: ubuntu-latest
+    timeout-minutes: 25
     steps:
       - uses: actions/checkout@v4
       - name: Prepare the next main release

.github/workflows/e2e-test.yml

@@ -131,6 +131,11 @@ jobs:
           WEBHOOK_PASSWORD: 1234
           CI: TRUE
 
+      - name: Delete Webhook
+        run: |
+          echo "Running DeleteWebhook command after E2E tests for clean-up"
+          docker exec -u www-data magento2-container php bin/magento adyen:management:delete-webhook
+
       - name: Archive test result artifacts
         if: always()
         uses: actions/upload-artifact@v4

.github/workflows/graphql-test.yml

@@ -10,6 +10,7 @@ jobs:
         php-version: ["8.2"]
         magento-version: ["2.4.6-p7"]
     runs-on: ubuntu-latest
+    timeout-minutes: 25
     env:
       PHP_VERSION: ${{ matrix.php-version }}
       MAGENTO_VERSION: ${{ matrix.magento-version }}

.github/workflows/main.yml

@@ -10,7 +10,7 @@ jobs:
     if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository) || (github.event_name == 'workflow_dispatch')
     environment: ${{ (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository) && 'external' || 'internal' }}
     runs-on: ubuntu-latest
-
+    timeout-minutes: 25
     strategy:
       matrix:
         php-version: [8.2,8.3]
@@ -47,7 +47,7 @@ jobs:
 
       - name: SonarCloud Scan
         if: ${{ env.SONAR_TOKEN }}
-        uses: SonarSource/sonarcloud-github-action@master
+        uses: SonarSource/sonarqube-scan-action@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/marketplace-release.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   marketplace-automation:
     runs-on: ubuntu-latest
-    # environment: internal
+    timeout-minutes: 25
 
     steps:
       - name: Checkout repository

.github/workflows/mftf-test.yml

@@ -16,6 +16,7 @@ jobs:
           - php-version: '8.3'
             magento-version: '2.4.7-p2'
     runs-on: ubuntu-latest
+    timeout-minutes: 25
     env:
       PHP_VERSION: ${{ matrix.php-version }}
       MAGENTO_VERSION: ${{ matrix.magento-version }}

.github/workflows/restapi-test.yml

@@ -10,6 +10,7 @@ jobs:
         php-version: [8.3]
         magento-version: [2.4.7-p2]
     runs-on: ubuntu-latest
+    timeout-minutes: 25
     env:
       PHP_VERSION: ${{ matrix.php-version }}
       MAGENTO_VERSION: ${{ matrix.magento-version }}