Merge pull request #673 from jolelievre/debug-ci

Fix docker env variable for version 8

.github/action.yml

@@ -6,11 +6,10 @@ runs:
     - 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' }}
       shell: bash
       run: |
-        bash -c 'if [[ "${VERSION}" == 1.6* ]]; then export BASE_VERSION=7.1-apache; \
-        elif [[ "${VERSION}" == 8.* ]]; then export BASE_VERSION=8.1-apache; \
-        else export BASE_VERSION=7.2-apache; fi && docker compose up -d'
+        docker compose up -d
         bash -c 'while [[ "$(curl -L -s -o /dev/null -w %{http_code} http://localhost:8001/index.php)" != "200" ]]; do sleep 5; done'
     - name: Copy autoupgrade module
       shell: bash

.github/workflows/php.yml

@@ -1,5 +1,8 @@
 name: PHP tests
 on: [push, pull_request]
+concurrency:
+  group: ${{ github.event_name }}-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 jobs:
   # Check there is no syntax errors in the project
   php-linter:

.github/workflows/upgrade.yml

@@ -1,10 +1,13 @@
 name: Upgrades
 on: [push, pull_request]
+concurrency:
+  group: ${{ github.event_name }}-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 jobs:
   upgrade:
     strategy:
       matrix:
-        from: ['1.7.6.9', '1.7.6.1', '1.7.7.0', '8.0.0']
+        from: ['1.7.6.9', '1.7.6.1', '1.7.7.0', '8.0.0', '8.1.0']
         ps-versions:
           - channel: minor
           - channel: major

AdminSelfUpgrade.php

@@ -34,7 +34,10 @@
 use PrestaShop\Module\AutoUpgrade\UpgradeSelfCheck;
 use PrestaShop\Module\AutoUpgrade\UpgradeTools\FilesystemAdapter;
 
-require_once _PS_ROOT_DIR_ . '/modules/autoupgrade/vendor/autoload.php';
+$autoloadPath = __DIR__ . '/vendor/autoload.php';
+if (file_exists($autoloadPath)) {
+    require_once $autoloadPath;
+}
 
 class AdminSelfUpgrade extends AdminController
 {

autoupgrade.php

@@ -123,7 +123,15 @@ public function uninstall()
      */
     public function registerHookAndSetToTop($hookName)
     {
-        return $this->registerHook($hookName) && $this->updatePosition((int) Hook::getIdByName($hookName), false);
+        if (!$this->registerHook($hookName)) {
+            return false;
+        }
+
+        // Updating position is not blocking for installation esepcially since this method returns false when no other
+        // module is hooked, which doesn't mean the module can't work as expected.
+        $this->updatePosition((int) Hook::getIdByName($hookName), false);
+
+        return true;
     }
 
     public function hookDashboardZoneOne($params)

docker-compose.yml

@@ -1,14 +1,22 @@
-version: '2'
+version: '2.1'
+
+volumes:
+  db-data:
+  vendor:
+  var:
+  temp-ps:
 
 services:
   mysql:
     image: mysql:5.7
     ports:
-      - '3306'
+      - "3306"
+    volumes:
+      - db-data:/var/lib/mysql
     environment:
       MYSQL_ROOT_PASSWORD: root
       MYSQL_DATABASE: psreference
-
+    restart: always
   reference-release:
     container_name: prestashop_autoupgrade
     build:
@@ -21,21 +29,20 @@ services:
       - ./:/var/www/html/modules/autoupgrade
       - temp-ps:/var/www/html # Used for another container which needs PrestaShop content
     environment:
+      DISABLE_MAKE: 0
+      PS_INSTALL_AUTO: 1
       DB_SERVER: mysql
       DB_PASSWD: root
       DB_NAME: psreference
       PS_DOMAIN: localhost:8001
-      PS_INSTALL_AUTO: 1
       PS_INSTALL_DB: 1
       PS_ERASE_DB: 1
       PS_FOLDER_ADMIN: admin-dev
       PS_FOLDER_INSTALL: install-dev
       PS_LANGUAGE: en
       PS_COUNTRY: fr
+      PS_DEV_MODE: 0
     depends_on:
       - mysql
     ports:
       - '8001:80'
-
-volumes:
-  temp-ps: