diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a3680f0..8f4dfd7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -9,26 +9,27 @@ jobs: deploy: runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v3 - - name: Set up SSH - uses: webfactory/ssh-agent@v0.5.3 - with: - ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} + # Uncomment the following for a standard deployment to Kinsta + # steps: + # - name: Checkout code + # uses: actions/checkout@v4 + # - name: Set up SSH + # uses: webfactory/ssh-agent@v0.9.0 + # with: + # ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} + + # - name: Add GitHub to known hosts + # run: | + # ssh-keyscan -H github.com >> ~/.ssh/known_hosts - - name: Add GitHub to known hosts - run: | - ssh-keyscan -H github.com >> ~/.ssh/known_hosts + # - name: Check SSH connection + # run: | + # ssh -o StrictHostKeyChecking=no -A ${{ secrets.SSH_USER_HOST }} -p ${{ secrets.SSH_PORT }} "echo 'SSH connection successful'" - - name: Check SSH connection - run: | - ssh -o StrictHostKeyChecking=no -A ${{ secrets.SSH_USER_HOST }} -p ${{ secrets.SSH_PORT }} "echo 'SSH connection successful'" + # - name: Verify forwarded SSH key on remote server + # run: | + # ssh -o StrictHostKeyChecking=no -A ${{ secrets.SSH_USER_HOST }} -p ${{ secrets.SSH_PORT }} 'ssh-add -l' - - name: Verify forwarded SSH key on remote server - run: | - ssh -o StrictHostKeyChecking=no -A ${{ secrets.SSH_USER_HOST }} -p ${{ secrets.SSH_PORT }} 'ssh-add -l' - - - name: Run git pull on the remote server - run: | - ssh -o StrictHostKeyChecking=no -A ${{ secrets.SSH_USER_HOST }} -p ${{ secrets.SSH_PORT }} 'cd public && git pull && composer install --no-dev --no-scripts ; wp plugin activate --all' \ No newline at end of file + # - name: Run git pull on the remote server + # run: | + # ssh -o StrictHostKeyChecking=no -A ${{ secrets.SSH_USER_HOST }} -p ${{ secrets.SSH_PORT }} 'cd public && git pull && composer install --no-dev --no-scripts ; wp plugin activate --all' diff --git a/composer.json b/composer.json index a0d4884..315fc60 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "oscarotero/env": "^2.1", "roots/bedrock-autoloader": "^1.0.4", "roots/bedrock-disallow-indexing": "^2.0", - "roots/wordpress": "6.6.1", + "roots/wordpress": "6.6.2", "roots/wp-config": "1.0.0", "roots/wp-password-bcrypt": "1.1.0", "wpackagist-plugin/wordpress-importer": "^0.8.0", diff --git a/composer.lock b/composer.lock index f0eed13..ec729f3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "44a46b92f74de818b9cb02798f2a7331", + "content-hash": "8e1053c02dcdcfae66593c3ef9003260", "packages": [ { "name": "composer/installers", @@ -480,7 +480,7 @@ }, { "name": "roots/wordpress", - "version": "6.6.1", + "version": "6.6.2", "source": { "type": "git", "url": "https://github.com/roots/wordpress.git", @@ -511,7 +511,7 @@ ], "support": { "issues": "https://github.com/roots/wordpress/issues", - "source": "https://github.com/roots/wordpress/tree/6.6.1" + "source": "https://github.com/roots/wordpress/tree/6.6.2" }, "funding": [ { @@ -594,22 +594,22 @@ }, { "name": "roots/wordpress-no-content", - "version": "6.6.1", + "version": "6.6.2", "source": { "type": "git", "url": "https://github.com/WordPress/WordPress.git", - "reference": "6.6.1" + "reference": "6.6.2" }, "dist": { "type": "zip", - "url": "https://downloads.wordpress.org/release/wordpress-6.6.1-no-content.zip", - "shasum": "954aa560a66112cd999aa9d9519da5f964e6692a" + "url": "https://downloads.wordpress.org/release/wordpress-6.6.2-no-content.zip", + "shasum": "b496b8a9bb3c6d20a781344cbe3e189f7fd83871" }, "require": { - "php": ">= 7.0.0" + "php": ">= 7.2.24" }, "provide": { - "wordpress/core-implementation": "6.6.1" + "wordpress/core-implementation": "6.6.2" }, "suggest": { "ext-curl": "Performs remote request operations.", @@ -660,7 +660,7 @@ "type": "other" } ], - "time": "2024-07-23T15:25:13+00:00" + "time": "2024-09-10T15:25:31+00:00" }, { "name": "roots/wp-config", @@ -2023,16 +2023,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.10.2", + "version": "3.10.3", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017" + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/86e5f5dd9a840c46810ebe5ff1885581c42a3017", - "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/62d32998e820bddc40f99f8251958aed187a5c9c", + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c", "shasum": "" }, "require": { @@ -2099,7 +2099,7 @@ "type": "open_collective" } ], - "time": "2024-07-21T23:26:44+00:00" + "time": "2024-09-18T10:38:58+00:00" }, { "name": "wpackagist-plugin/create-block-theme", @@ -2186,5 +2186,5 @@ "php": ">=8.0" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/web/app/themes/package-lock.json b/web/app/themes/package-lock.json index b868607..c2798cf 100644 --- a/web/app/themes/package-lock.json +++ b/web/app/themes/package-lock.json @@ -1762,9 +1762,9 @@ } }, "node_modules/husky": { - "version": "9.1.5", - "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.5.tgz", - "integrity": "sha512-rowAVRUBfI0b4+niA4SJMhfQwc107VLkBUgEYYAOQAbqDCnra1nYh83hF/MDmhYs9t9n1E3DuKOrs2LYNC+0Ag==", + "version": "9.1.6", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.6.tgz", + "integrity": "sha512-sqbjZKK7kf44hfdE94EoX8MZNk0n7HeW37O4YrVGCF4wzgQjp+akPAkfUK5LZ6KuR/6sqeAVuXHji+RzQgOn5A==", "dev": true, "bin": { "husky": "bin.js" @@ -4899,9 +4899,9 @@ "dev": true }, "husky": { - "version": "9.1.5", - "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.5.tgz", - "integrity": "sha512-rowAVRUBfI0b4+niA4SJMhfQwc107VLkBUgEYYAOQAbqDCnra1nYh83hF/MDmhYs9t9n1E3DuKOrs2LYNC+0Ag==", + "version": "9.1.6", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.6.tgz", + "integrity": "sha512-sqbjZKK7kf44hfdE94EoX8MZNk0n7HeW37O4YrVGCF4wzgQjp+akPAkfUK5LZ6KuR/6sqeAVuXHji+RzQgOn5A==", "dev": true }, "ignore": {