diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index cb54ebc..b42252e 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -12,24 +12,26 @@ jobs: MYSQL_ROOT_PASSWORD: root MYSQL_USER: sqlmonarcuser MYSQL_PASSWORD: password + MYSQL_VERSION: 10.6.18 steps: - uses: actions/checkout@v1 - #- name: Shutdown Ubuntu MySQL (SUDO) - #run: sudo service mysql stop + - name: Shutdown Ubuntu MySQL (SUDO) + run: sudo service mysql stop - #- name: Start MariaDB and create databases - #uses: getong/mariadb-action@v1.1 - #with: - #host port: $MYSQL_HOST_PORT - #mysql database: $MYSQL_DATABASE # Optional, default value is "test". The specified database which will be create - #mysql root password: $MYSQL_ROOT_PASSWORD # Required if "mysql user" is empty, default is empty. The root superuser password - #mysql user: $MYSQL_USER # Required if "mysql root password" is empty, default is empty. The superuser for the specified database. Can use secrets, too - #mysql password: $MYSQL_PASSWORD # Required if "mysql user" exists. The password for the "mysql user" + - name: Start MariaDB and create databases + uses: getong/mariadb-action@v1.1 + with: + host port: $MYSQL_HOST_PORT + mariadb version: $MYSQL_VERSION # Optional, default value is "latest". The version of the MariaDB + mysql database: $MYSQL_DATABASE # Optional, default value is "test". The specified database which will be create + mysql root password: $MYSQL_ROOT_PASSWORD # Required if "mysql user" is empty, default is empty. The root superuser password + mysql user: $MYSQL_USER # Required if "mysql root password" is empty, default is empty. The superuser for the specified database. Can use secrets, too + mysql password: $MYSQL_PASSWORD # Required if "mysql user" exists. The password for the "mysql user" - - name: Start MySQL (SUDO) - run: sudo service mysql start +# - name: Start MySQL (SUDO) +# run: sudo service mysql start - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -67,6 +69,7 @@ jobs: mysql -u $MYSQL_USER -p$MYSQL_PASSWORD -P $MYSQL_HOST_PORT $MYSQL_DATABASE < db-bootstrap/monarc_structure.sql mysql -u $MYSQL_USER -p$MYSQL_PASSWORD -P $MYSQL_HOST_PORT $MYSQL_DATABASE < db-bootstrap/monarc_data.sql + - name: Upgrading databases run: | ./vendor/robmorgan/phinx/bin/phinx migrate -c ./module/Monarc/Core/migrations/phinx.php diff --git a/composer.lock b/composer.lock index d0ba042..043e08b 100644 --- a/composer.lock +++ b/composer.lock @@ -5238,12 +5238,12 @@ "source": { "type": "git", "url": "https://github.com/monarc-project/zm-client.git", - "reference": "330860b5c5ac46ee7584e8a83cca4620fb358a6e" + "reference": "4113c6fce07d3b56710bdd85a2548d5baae119d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/330860b5c5ac46ee7584e8a83cca4620fb358a6e", - "reference": "330860b5c5ac46ee7584e8a83cca4620fb358a6e", + "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/4113c6fce07d3b56710bdd85a2548d5baae119d4", + "reference": "4113c6fce07d3b56710bdd85a2548d5baae119d4", "shasum": "" }, "require": { @@ -5328,7 +5328,7 @@ "issues": "https://github.com/monarc-project/zm-client/issues", "source": "https://github.com/monarc-project/zm-client/tree/v2.13.1" }, - "time": "2024-10-06T16:46:55+00:00" + "time": "2024-10-06T16:55:34+00:00" }, { "name": "nikic/php-parser",