Skip to content

Commit

Permalink
Merge branch '4.x-development' into 3.x-development
Browse files Browse the repository at this point in the history
  • Loading branch information
@hadomskyi
hadomskyi authored Sep 4, 2023
2 parents e3c2b44 + fe00734 commit c0e78f0
Show file tree
Hide file tree
Showing 96 changed files with 3,622 additions and 2,123 deletions.
176 changes: 73 additions & 103 deletions .github/workflows/craft-versions.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ name: Tests on multiple craft versions
on:
push:
branches:
- 3.x #CraftCMS v3 | PHP 7.2
- 4.x #CraftCMS v4 | PHP 8.0.2
- 4.x #CraftCMS v4
pull_request:
branches:
- "*"
Expand All @@ -12,117 +11,88 @@ jobs:
strategy:
matrix:
craft_version: [
"3.7.0",
"3.7.1",
"3.7.2",
"3.7.3.1",
"3.7.3.2",
"3.7.3",
"3.7.4",
"3.7.5",
"3.7.6",
"3.7.8",
"3.7.9",
"3.7.10",
"3.7.11",
"3.7.12",
"3.7.13",
"3.7.14",
"3.7.15",
"3.7.16",
"3.7.17",
"3.7.17.1",
"3.7.17.2",
"3.7.18",
"3.7.18.1",
"3.7.18.2",
"3.7.19",
"3.7.19.1",
"3.7.20",
"3.7.21",
"3.7.22",
"3.7.23",
"3.7.24",
"3.7.25",
"3.7.25.1",
"3.7.26",
"3.7.27",
"3.7.27.1",
"3.7.27.2",
"3.7.28",
"3.7.29",
"3.7.30",
"3.7.30.1",
"3.7.31",
"3.7.32",
"3.7.33",
"3.7.34",
"3.7.35",
"3.7.36",
"3.7.37",
"3.7.38",
"3.7.39",
# TODO: check this
# Investigation:
# https://github.com/craftcms/cms/issues/11083
# 3.7.40, 3.7.40.1 contains FK bug, it tries to update field on draft (after apply draft removed, so it fails)
# "3.7.40"
# "3.7.40.1",
"3.7.41",
"3.7.42",
"3.7.43",
"3.7.44",
"3.7.45",
"3.7.45.1",
"3.7.45.2",
"3.7.46",
"3.7.47",
"3.7.47.1",
"3.7.48",
"3.7.49",
"3.7.50",
"3.7.51",
"3.7.52",
"3.7.53",
"3.7.53.1",
"3.7.54",
"3.7.55",
"3.7.55.1",
"3.7.55.2",
"3.7.55.3",
"3.7.56",
"3.7.57",
"3.7.58",
"3.7.59",
"3.7.60",
"3.7.61",
"3.7.62",
"3.7.63",
"3.7.63.1",
"3.7.64",
"3.7.64.1",
"3.7.65",
"3.7.65.1",
"3.7.65.2",
"3.7.66",
"3.7.67",
"3.7.68",
"3.8.0",
"3.8.1",
"3.8.2",
"3.8.3",
"3.8.4",
"3.8.5",
"3.8.6",
"3.8.7",
#"4.0.0", contains FK bug, it tries to update field on draft (after apply draft removed, so it fails)
"4.0.1",
"4.0.2",
"4.0.3",
"4.0.4",
"4.0.5",
"4.0.5.1",
"4.0.5.2",
"4.0.6",
"4.0.6",
"4.1.0",
"4.1.0.1",
"4.1.0.2",
"4.1.1",
"4.1.2",
"4.1.3",
"4.1.4",
"4.1.4.1",
"4.2.0",
"4.2.0.1",
"4.2.0.2",
"4.2.1",
"4.2.1.1",
"4.2.2",
"4.2.3",
"4.2.4",
"4.2.5",
"4.2.5.1",
"4.2.5.2",
"4.2.6",
"4.2.7",
"4.2.8",
"4.3.0",
"4.3.1",
"4.3.2",
"4.3.2.1",
"4.3.3",
"4.3.4",
"4.3.5",
"4.3.6",
"4.3.6.1",
"4.3.7",
"4.3.7.1",
"4.3.8",
"4.3.8.1",
"4.3.8.2",
"4.3.9",
"4.3.10",
"4.3.11",
"4.4.0",
"4.4.1",
"4.4.2",
"4.4.3",
"4.4.4",
"4.4.5",
"4.4.6",
"4.4.6.1",
"4.4.7",
"4.4.7.1",
"4.4.8",
"4.4.9",
"4.4.10",
"4.4.10.1",
"4.4.11",
"4.4.12",
"4.4.13",
"4.4.14",
"4.4.15",
"4.4.16",
"4.4.16.1",
"4.4.17",
]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set the value
id: step_one
run: |
echo "PHP_VERSION=7.2" >> $GITHUB_ENV
echo "PHP_VERSION=8.1" >> $GITHUB_ENV
echo "CRAFT_VERSION=${{ matrix.craft_version }}" >> $GITHUB_ENV
- name: Test craft versions ${{ matrix.craft_version }}
run: make test-craft-versions
6 changes: 4 additions & 2 deletions .github/workflows/e2e.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ name: E2E Tests
on:
push:
branches:
- 3.x #CraftCMS v3 | PHP 7.2
- 4.x #CraftCMS v4 | PHP 8.0.2
- 4.x #CraftCMS v4
pull_request:
branches:
- "*"
Expand Down Expand Up @@ -50,13 +49,16 @@ jobs:
working-directory: ./e2e
run: |
make backup-db
mkdir var
mkdir var/log
mkdir cypress/craft
mkdir cypress/craft/storage
mkdir cypress/craft/config
docker compose cp app:/app/storage cypress/craft/storage
docker compose cp app:/app/config cypress/craft/config
docker compose cp app:/app/composer.json cypress/craft
docker compose cp app:/app/composer.lock cypress/craft
docker compose cp app:/var/log var/log
- name: Use the Upload Artifact GitHub Action
uses: actions/upload-artifact@v2
if: ${{ failure() }}
Expand Down
66 changes: 2 additions & 64 deletions .github/workflows/push.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,56 +2,11 @@ name: Tests
on:
push:
branches:
- 3.x #CraftCMS v3 | PHP 7.2
- 4.x #CraftCMS v4
pull_request:
branches:
- "*"
jobs:
tests-php-72:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set the value
id: step_one
run: |
echo "PHP_VERSION=7.2" >> $GITHUB_ENV
- name: Build containers
run: make up
- name: Composer install
run: make composer-install
- name: Tests
run: make test

tests-php-73:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set the value
id: step_one
run: |
echo "PHP_VERSION=7.3" >> $GITHUB_ENV
- name: Build containers
run: make up
- name: Composer install
run: make composer-install
- name: Tests
run: make test

tests-php-74:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set the value
id: step_one
run: |
echo "PHP_VERSION=7.4" >> $GITHUB_ENV
- name: Build containers
run: make up
- name: Composer install
run: make composer-install
- name: Tests
run: make test

tests-php-80:
runs-on: ubuntu-latest
steps:
Expand All @@ -67,23 +22,6 @@ jobs:
- name: Tests
run: make test

tests-php-72-guzzle-6:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set the value
id: step_one
run: |
echo "PHP_VERSION=7.2" >> $GITHUB_ENV
- name: Build containers
run: make up
- name: Composer install
run: make composer-install
- name: Require Guzzle v6
run: make require-guzzle-v6
- name: Tests
run: make test

tests-php-80-mysql-80:
runs-on: ubuntu-latest
steps:
Expand All @@ -100,7 +38,7 @@ jobs:
- name: Tests
run: make test

tests-php-latest:
tests-php-81:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down
Loading

0 comments on commit c0e78f0

Please sign in to comment.