Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a failsafe require and add first working version of 1.7 in automatic tests #688

Merged
merged 9 commits into from
Apr 22, 2024
Merged

Add a failsafe require and add first working version of 1.7 in automatic tests #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
811b952
fix: move require appkernel to top level
ga-devfront Apr 9, 2024
8ecd673
feat: add 1.7.1.0 version to upgrades test cause he got some issue no…
ga-devfront Apr 9, 2024
26eab11
feat: add get base version step and add all version from 1.6 to 8.1
ga-devfront Apr 9, 2024
756002b
feat: fix output
ga-devfront Apr 9, 2024
662836a
fix: typo in ci
ga-devfront Apr 9, 2024
a025682
fix: remove fix to check ci fail
ga-devfront Apr 15, 2024
ab2c8ab
feat: add 1.7.0.1 to CI
ga-devfront Apr 15, 2024
4eedc3e
fix: remove require adminkernel and put require appkernel on top level
ga-devfront Apr 15, 2024
bf4d383
Push matrix boundaries to PS 1.7.0.6, first version that can be opene…
Quetzacoalt91 Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion .github/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,35 @@ description: Test PrestaShop upgrade process
runs:
using: composite
steps:
- name: Get base version
id: get_base_version
shell: bash
run: |
case ${{ matrix.from }} in
1.6* | 1.7.[1-4]*)
echo "BASE_VERSION=7.1-apache" >> "$GITHUB_OUTPUT"
;;
1.7.[5-6]*)
echo "BASE_VERSION=7.2-apache" >> "$GITHUB_OUTPUT"
;;
1.7.7*)
echo "BASE_VERSION=7.3-apache" >> "$GITHUB_OUTPUT"
;;
1.7.8*)
echo "BASE_VERSION=7.4-apache" >> "$GITHUB_OUTPUT"
;;
8.0* | 8.1*)
echo "BASE_VERSION=8.1-apache" >> "$GITHUB_OUTPUT"
;;
*)
echo "BASE_VERSION=7.1-apache" >> "$GITHUB_OUTPUT"
;;
esac

- name: Build docker compose stack
env:
VERSION: ${{ matrix.from }}
BASE_VERSION: ${{ startsWith(matrix.from, '1.6') && '7.1-apache' || startsWith(matrix.from, '8.1') && '8.1-apache' || startsWith(matrix.from, '8.0') && '8.1-apache' || '7.2-apache' }}
BASE_VERSION: ${{ steps.get_base_version.outputs.BASE_VERSION }}
shell: bash
run: |
docker compose up -d
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upgrade.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
upgrade:
strategy:
matrix:
from: ['1.7.6.9', '1.7.6.1', '1.7.7.0', '8.0.0', '8.1.0']
from: ['1.7.0.6', '1.7.6.9', '1.7.6.1', '1.7.7.0', '8.0.0', '8.1.0']
ps-versions:
- channel: minor
- channel: major
Expand Down
7 changes: 4 additions & 3 deletions classes/UpgradeTools/SymfonyAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,14 @@ public function initKernel()
{
global $kernel;
if (!$kernel instanceof \AppKernel) {
// Only necessary one version before 1.7.3 because he is not classmaped on composer
require_once _PS_ROOT_DIR_ . '/app/AppKernel.php';
$env = (true == _PS_MODE_DEV_) ? 'dev' : 'prod';

if ($this->isAppKernelAbstract()) { // From version 9 the AppKernel becomes an abstract so we need to check if it is one to know which Kernel to use
require_once _PS_ROOT_DIR_ . '/app/AdminKernel.php';
// From version 9 the AppKernel becomes an abstract so we need to check if it is one to know which Kernel to use
if ($this->isAppKernelAbstract()) {
$kernelClass = 'AdminKernel';
} else {
require_once _PS_ROOT_DIR_ . '/app/AppKernel.php';
$kernelClass = 'AppKernel';
}

Expand Down
Loading