diff --git a/.github/workflows/analyse.yml b/.github/workflows/analyse.yml index e4f40a54b..40b7ad108 100644 --- a/.github/workflows/analyse.yml +++ b/.github/workflows/analyse.yml @@ -8,36 +8,23 @@ on: pull_request: jobs: - analyse: - runs-on: ubuntu-latest + test: + uses: rapidez/workflows/.github/workflows/analyse.yml@master strategy: fail-fast: true matrix: - php: [8.3, 8.4] + os: [ubuntu-latest] + php: [8.3, 8.4, 8.5] laravel: [12.*, 13.*] - stability: [prefer-stable] + stability: [prefer-stable, prefer-lowest] include: - laravel: 12.* testbench: 10.* - laravel: 13.* testbench: 11.* - - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.head_ref }} - token: ${{ secrets.RAPIDEZ_ACTIONS_ACCOUNT_PAT }} - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo - coverage: none - - - name: Install dependencies - run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update - composer update --${{ matrix.stability }} --prefer-dist --no-interaction - - name: Analyse - run: composer analyse + with: + os: ${{ matrix.os }} + php: ${{ matrix.php }} + laravel: ${{ matrix.laravel }} + testbench: ${{ matrix.testbench }} + stability: ${{ matrix.stability }} diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 43351a6ab..f7037744b 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -7,26 +7,11 @@ on: jobs: generate: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v3 - with: - ref: ${{ github.event.release.target_commitish }} - token: ${{ secrets.RAPIDEZ_ACTIONS_ACCOUNT_PAT }} - - - name: Generate changelog - uses: justbetter/generate-changelogs-action@main - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - repository: ${{ github.repository }} - sha: ${{ github.head_ref || github.ref_name }} - - - name: Commit CHANGELOG - uses: stefanzweifel/git-auto-commit-action@v4 - with: - branch: ${{ github.event.release.target_commitish }} - commit_message: Update CHANGELOG - file_pattern: CHANGELOG.md + uses: rapidez/workflows/.github/workflows/changelog.yml@master + with: + repository: ${{ github.repository }} + branch: ${{ github.event.release.target_commitish }} + ref: ${{ github.head_ref || github.ref_name }} + token: ${{ secrets.RAPIDEZ_ACTIONS_ACCOUNT_PAT }} + github-token: ${{ secrets.GITHUB_TOKEN }} + \ No newline at end of file diff --git a/.github/workflows/duster-fix-blame.yml b/.github/workflows/duster-fix-blame.yml index 5e5093191..698bcae50 100644 --- a/.github/workflows/duster-fix-blame.yml +++ b/.github/workflows/duster-fix-blame.yml @@ -8,25 +8,7 @@ on: jobs: duster: - runs-on: ubuntu-latest - - permissions: - contents: write - - steps: - - uses: actions/checkout@v3 - with: - ref: ${{ github.head_ref }} - token: ${{ secrets.RAPIDEZ_ACTIONS_ACCOUNT_PAT }} - - - name: "Duster Fix" - uses: tighten/duster-action@v2 - with: - args: fix -vvv - - - uses: stefanzweifel/git-auto-commit-action@v4 - id: auto_commit_action - with: - commit_message: Apply fixes from Duster - commit_user_name: GitHub Action - commit_user_email: actions@github.com + uses: rapidez/workflows/.github/workflows/duster-fix-blame.yml@master + with: + ref: ${{ github.head_ref }} + repo-token: ${{ secrets.RAPIDEZ_ACTIONS_ACCOUNT_PAT }} \ No newline at end of file diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index 57ad92f29..bd5bcd957 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -27,12 +27,15 @@ jobs: fail-fast: false matrix: include: - - magento-version: 2.4.7-p9 + - magento-version: 2.4.7-p10 magento-php-version: php83-fpm rapidez-php-version: 8.3 - - magento-version: 2.4.8-p4 + - magento-version: 2.4.8-p5 magento-php-version: php84-fpm rapidez-php-version: 8.4 + - magento-version: 2.4.9 + magento-php-version: php85-fpm + rapidez-php-version: 8.5 screenshots: true services: diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 6dca4f9eb..f8943d5a0 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -9,18 +9,4 @@ on: jobs: translations: - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: '8.4' - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick - coverage: none - - name: Install dependencies - run: composer install --prefer-dist --no-interaction - - name: Check translations - uses: rapidez/laravel-translation-checker@master + uses: rapidez/workflows/.github/workflows/translations.yml@master \ No newline at end of file diff --git a/composer.json b/composer.json index 27432b2e6..aaae9861a 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "laravel/framework": "^12.50|^13.0", "laravel/scout": "^10.14", "lcobucci/clock": "^2.0|^3.2", - "lcobucci/jwt": "^4.0|^5.3", + "lcobucci/jwt": "^4.2|^5.3", "rapidez/blade-components": "^2.0", "rapidez/blade-directives": "^1.1", "rapidez/laravel-multi-cache": "^2.1", diff --git a/resources/views/checkout/queries/setBillingAddressOnCart.graphql b/resources/views/checkout/queries/setBillingAddressOnCart.graphql index 85bafa31f..96a6a2157 100644 --- a/resources/views/checkout/queries/setBillingAddressOnCart.graphql +++ b/resources/views/checkout/queries/setBillingAddressOnCart.graphql @@ -11,7 +11,7 @@ mutation ( $city: String!, $country_code: String!, $region_id: Int, - $telephone: String, + $telephone: String!, $fax: String, $company: String, $vat_id: String, diff --git a/resources/views/checkout/queries/setNewBillingAddressOnCart.graphql b/resources/views/checkout/queries/setNewBillingAddressOnCart.graphql index 5f5fde638..52c679df3 100644 --- a/resources/views/checkout/queries/setNewBillingAddressOnCart.graphql +++ b/resources/views/checkout/queries/setNewBillingAddressOnCart.graphql @@ -11,7 +11,7 @@ mutation setNewBillingAddressOnCart ( $city: String!, $country_code: String!, $region_id: Int, - $telephone: String, + $telephone: String!, $fax: String, $company: String, $vat_id: String, diff --git a/resources/views/checkout/queries/setNewShippingAddressesOnCart.graphql b/resources/views/checkout/queries/setNewShippingAddressesOnCart.graphql index 44659a12c..4f8045e7c 100644 --- a/resources/views/checkout/queries/setNewShippingAddressesOnCart.graphql +++ b/resources/views/checkout/queries/setNewShippingAddressesOnCart.graphql @@ -10,7 +10,7 @@ mutation setNewShippingAddressOnCart ( $city: String!, $country_code: String!, $region_id: Int, - $telephone: String, + $telephone: String!, $fax: String, $company: String, $vat_id: String,