Skip to content

Commit

Permalink
Merge branch 'develop' into fix/8080-handle-402-errors
Browse files Browse the repository at this point in the history
  • Loading branch information
zmaglica authored Feb 21, 2024
2 parents ffb36ec + 6a8974d commit 5bb9431
Show file tree
Hide file tree
Showing 373 changed files with 8,094 additions and 4,654 deletions.
2 changes: 1 addition & 1 deletion .github/actions/e2e/atomic-prepare-and-run/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ runs:
# Cache node dependencies
- name: "Cache node modules"
id: node-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ./node_modules
key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/e2e/env-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@ runs:

# Use node version from .nvmrc
- name: Setup NodeJS
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'

# Cache composer dependencies
- name: Cache composer dependencies
id: composer-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ./vendor
key: ${{ runner.os }}-vendor-${{ hashFiles('composer.lock') }}

# Cache node dependencies
- name: Cache node dependencies
id: node-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ./node_modules
key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/e2e/run-log-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ runs:
# Archive screenshots if any
- name: Archive e2e test screenshots & logs
if: ${{ failure() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wp(${{ env.E2E_WP_VERSION }})-wc(${{ env.E2E_WC_VERSION }})-${{ env.E2E_GROUP }}-${{ env.E2E_BRANCH }}
path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/setup-repo/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ runs:
using: composite
steps:
- name: "Setup Node"
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: "npm"

- name: "Enable composer dependencies caching"
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache/composer/
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-zip-and-run-smoke-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Checkout repository"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.repo-branch || github.ref }}

Expand All @@ -43,7 +43,7 @@ jobs:
echo ":information_source: Ignore the artifact size mentioned since GitHub calculates the size of the source folder instead of the zip file created." >> $GITHUB_STEP_SUMMARY
- name: "Upload the zip file as an artifact"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bundle-size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use desired version of NodeJS
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
cache: npm
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
runs-on: ubuntu-latest
steps:
# clone the repository
- uses: actions/checkout@v3
- uses: actions/checkout@v4
# enable dependencies caching
- name: Add composer to cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache/composer/
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ jobs:
matrix: ${{ fromJSON(needs.generate-wc-compat-matrix.outputs.matrix) }}
steps:
# clone the repository
- uses: actions/checkout@v3
- uses: actions/checkout@v4
# enable dependencies caching
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.cache/composer/
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
Expand Down Expand Up @@ -81,9 +81,9 @@ jobs:
GUTENBERG_VERSION: ${{ matrix.gutenberg }}
steps:
# clone the repository
- uses: actions/checkout@v3
- uses: actions/checkout@v4
# enable dependencies caching
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.cache/composer/
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ jobs:
COVERAGE_DIR: ${{ matrix.directory }}
steps:
# clone the repository
- uses: actions/checkout@v3
- uses: actions/checkout@v4
# enable dependencies caching
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.cache/composer/
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: "Checkout repository"
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: "Set up repository"
uses: ./.github/actions/setup-repo
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-api-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Build
run: cd docs/rest-api && ./build.sh
- name: Deploy to GitHub Pages
if: success()
uses: crazy-max/ghaction-github-pages@v3
uses: crazy-max/ghaction-github-pages@v4
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ jobs:

steps:
- name: Checkout WCPay repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.repo-branch || github.ref }}

- name: "Download WooCommerce Payments build file"
if: ${{ inputs.wcpay-use-build-artifact }}
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: woocommerce-payments
path: ${{ env.WCPAY_ARTIFACT_DIRECTORY }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:

steps:
- name: Checkout WCPay repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup E2E environment
uses: ./.github/actions/e2e/env-setup
Expand All @@ -83,7 +83,7 @@ jobs:

# steps:
# - name: Checkout WCPay repository
# uses: actions/checkout@v2
# uses: actions/checkout@v4

# - name: Setup E2E environment
# uses: ./.github/actions/e2e/env-setup
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:

steps:
- name: Checkout WCPay repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup E2E environment
uses: ./.github/actions/e2e/env-setup
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests-atomic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

steps:
- name: "Checkout repository"
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: "Run the tests"
uses: ./.github/actions/e2e/atomic-prepare-and-run
8 changes: 4 additions & 4 deletions .github/workflows/i18n-weekly-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ jobs:

steps:
# clone the repository
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# Use project specific node version
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'

# enable dependencies caching (vendor and node_modules are wiped during build so they are ignored here)
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.cache/composer/
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.npm/
key: ${{ runner.os }}-npm-${{ hashFiles('package-lock.json') }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/js-lint-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ jobs:
runs-on: ubuntu-latest
steps:
# clone the repository
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
# enable dependencies caching
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.cache/composer/
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.npm/
key: ${{ runner.os }}-npm-${{ hashFiles('package-lock.json') }}
Expand All @@ -35,16 +35,16 @@ jobs:
runs-on: ubuntu-latest
steps:
# clone the repository
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
# enable dependencies caching
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.cache/composer/
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.npm/
key: ${{ runner.os }}-npm-${{ hashFiles('package-lock.json') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/php-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
name: PHP Compatibility
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: "Set up PHP"
uses: ./.github/actions/setup-php
- run: bash bin/phpcs-compat.sh
8 changes: 4 additions & 4 deletions .github/workflows/php-lint-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
runs-on: ubuntu-latest
steps:
# clone the repository
- uses: actions/checkout@v3
- uses: actions/checkout@v4
# enable dependencies caching
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.cache/composer/
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
Expand Down Expand Up @@ -54,9 +54,9 @@ jobs:
matrix: ${{ fromJSON(needs.generate-test-matrix.outputs.matrix) }}
steps:
# clone the repository
- uses: actions/checkout@v3
- uses: actions/checkout@v4
# enable dependencies caching
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.cache/composer/
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/post-release-updates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

steps:
- name: "Checkout repository (trunk)"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: 'trunk'

Expand All @@ -37,7 +37,7 @@ jobs:

steps:
- name: "Checkout repository (trunk)"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: 'trunk'

Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:

steps:
- name: "Checkout repository"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: 'trunk'
fetch-depth: 0
Expand All @@ -101,7 +101,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Checkout repository (trunk)"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: 'trunk'

Expand All @@ -120,7 +120,7 @@ jobs:

steps:
- name: "Checkout repository (develop)"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: 'develop'

Expand All @@ -129,7 +129,7 @@ jobs:
run: php .github/workflows/scripts/get-next-version.php

- name: "Checkout repository's wiki"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: "${{ github.repository }}.wiki"
path: "wiki"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-build-live-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Checkout repository"
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: "Get current version"
id: current-version
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
echo ":information_source: Ignore the artifact size mentioned since GitHub calculates the size of the source folder instead of the zip file created." >> $GITHUB_STEP_SUMMARY
- name: "Upload the zip file as an artifact"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
RELEASE_DATE: ${{ inputs.release-date }}
steps:
- name: "Checkout repository"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ SECRETS.BOTWOO_TOKEN }}

Expand Down
Loading

0 comments on commit 5bb9431

Please sign in to comment.