From 24db3390c246bd8f73364aece541b2632a2f9dae Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Wed, 25 Oct 2023 10:03:35 -0400 Subject: [PATCH 1/6] Use same image for devshop.remote container so it doesn't have to build... which doesn't work. --- docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 05dcdfb9d..bd7f3cd56 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -46,7 +46,7 @@ services: - DEVSHOP_ANSIBLE_GROUP_NAME=devshop_server devshop.remote: - image: devshop/remote:latest + image: ${DEVSHOP_DOCKER_IMAGE:-devshop/server:php8.1} build: context: ".." dockerfile: "docker/Dockerfile.remote" From 2cd3ee63fb4d8f0d2dd7bdd89775f9beccd358ee Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Wed, 25 Oct 2023 10:09:16 -0400 Subject: [PATCH 2/6] Composer package updates: Changelogs summary: - drupal/provision updated from 4.0.0-beta17 to 4.0.0-beta18 patch --- src/DevShop/Control/composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/DevShop/Control/composer.lock b/src/DevShop/Control/composer.lock index 6bd66e78f..434659e97 100644 --- a/src/DevShop/Control/composer.lock +++ b/src/DevShop/Control/composer.lock @@ -3513,17 +3513,17 @@ }, { "name": "drupal/provision", - "version": "4.0.0-beta17", + "version": "4.0.0-beta18", "source": { "type": "git", "url": "https://git.drupalcode.org/project/provision.git", - "reference": "7.x-4.0-beta17" + "reference": "7.x-4.0-beta18" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/provision-7.x-4.0-beta17.zip", - "reference": "7.x-4.0-beta17", - "shasum": "2c45794f5d91f5f0745879634b289e0212f34e73" + "url": "https://ftp.drupal.org/files/projects/provision-7.x-4.0-beta18.zip", + "reference": "7.x-4.0-beta18", + "shasum": "b869dfacef65abc86eacfbdcacfe052e126a1488" }, "require": { "devshop/git-traits": "1.x-dev", @@ -3539,8 +3539,8 @@ "type": "drupal-drush", "extra": { "drupal": { - "version": "7.x-4.0-beta17", - "datestamp": "1696518528", + "version": "7.x-4.0-beta18", + "datestamp": "1698242909", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." From 3419400fc522067826c1df5135315972a3e23fa3 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Wed, 25 Oct 2023 10:10:43 -0400 Subject: [PATCH 3/6] Composer package updates: Changelogs summary: - drupal/core-composer-scaffold updated from 10.1.2 to 10.1.5 patch See changes: https://github.com/drupal/core-composer-scaffold/compare/10.1.2...10.1.5 Release notes: https://github.com/drupal/core-composer-scaffold/releases/tag/10.1.5 - psr/http-client updated from 1.0.2 to 1.0.3 patch See changes: https://github.com/php-fig/http-client/compare/1.0.2...1.0.3 Release notes: https://github.com/php-fig/http-client/releases/tag/1.0.3 - php-http/promise updated from 1.1.0 to 1.2.0 minor See changes: https://github.com/php-http/promise/compare/1.1.0...1.2.0 Release notes: https://github.com/php-http/promise/releases/tag/1.2.0 - knplabs/github-api updated from v3.11.0 to v3.12.0 minor See changes: https://github.com/KnpLabs/php-github-api/compare/v3.11.0...v3.12.0 Release notes: https://github.com/KnpLabs/php-github-api/releases/tag/v3.12.0 - drupal/core-utility updated from 9.5.10 to 9.5.11 patch See changes: https://github.com/drupal/core-utility/compare/9.5.10...9.5.11 Release notes: https://github.com/drupal/core-utility/releases/tag/9.5.11 - friends-of-behat/mink-extension updated from v2.7.2 to v2.7.4 patch See changes: https://github.com/FriendsOfBehat/MinkExtension/compare/v2.7.2...v2.7.4 Release notes: https://github.com/FriendsOfBehat/MinkExtension/releases/tag/v2.7.4 - justinrainbow/json-schema updated from 5.2.12 to v5.2.13 patch See changes: https://github.com/justinrainbow/json-schema/compare/5.2.12...v5.2.13 Release notes: https://github.com/justinrainbow/json-schema/releases/tag/v5.2.13 - symfony/var-dumper updated from v5.4.28 to v5.4.29 patch See changes: https://github.com/symfony/var-dumper/compare/v5.4.28...v5.4.29 Release notes: https://github.com/symfony/var-dumper/releases/tag/v5.4.29 - psy/psysh updated from v0.11.20 to v0.11.22 patch See changes: https://github.com/bobthecow/psysh/compare/v0.11.20...v0.11.22 Release notes: https://github.com/bobthecow/psysh/releases/tag/v0.11.22 --- src/DevShop/Control/composer.lock | 113 +++++++++++++++--------------- 1 file changed, 56 insertions(+), 57 deletions(-) diff --git a/src/DevShop/Control/composer.lock b/src/DevShop/Control/composer.lock index 434659e97..2293c0284 100644 --- a/src/DevShop/Control/composer.lock +++ b/src/DevShop/Control/composer.lock @@ -1920,7 +1920,7 @@ }, { "name": "drupal/core-composer-scaffold", - "version": "10.1.2", + "version": "10.1.5", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -1964,13 +1964,13 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.1.2" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.1.5" }, "time": "2023-04-30T16:15:32+00:00" }, { "name": "drupal/core-utility", - "version": "9.5.10", + "version": "9.5.11", "source": { "type": "git", "url": "https://github.com/drupal/core-utility.git", @@ -2006,7 +2006,7 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-utility/tree/9.5.10" + "source": "https://github.com/drupal/core-utility/tree/9.5.11" }, "time": "2023-05-02T08:15:56+00:00" }, @@ -4047,7 +4047,7 @@ "homepage": "https://www.drupal.org/user/26979" }, { - "name": "RenatoG", + "name": "renatog", "homepage": "https://www.drupal.org/user/3326031" }, { @@ -4484,16 +4484,16 @@ }, { "name": "friends-of-behat/mink-extension", - "version": "v2.7.2", + "version": "v2.7.4", "source": { "type": "git", "url": "https://github.com/FriendsOfBehat/MinkExtension.git", - "reference": "ffc5ee88aa8e5b430f0c417adb3f0c943ffeafed" + "reference": "18d5a53dff3e2c8934c53e2db8b02b7ea345fe85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfBehat/MinkExtension/zipball/ffc5ee88aa8e5b430f0c417adb3f0c943ffeafed", - "reference": "ffc5ee88aa8e5b430f0c417adb3f0c943ffeafed", + "url": "https://api.github.com/repos/FriendsOfBehat/MinkExtension/zipball/18d5a53dff3e2c8934c53e2db8b02b7ea345fe85", + "reference": "18d5a53dff3e2c8934c53e2db8b02b7ea345fe85", "shasum": "" }, "require": { @@ -4543,9 +4543,9 @@ "web" ], "support": { - "source": "https://github.com/FriendsOfBehat/MinkExtension/tree/v2.7.2" + "source": "https://github.com/FriendsOfBehat/MinkExtension/tree/v2.7.4" }, - "time": "2022-10-17T07:23:22+00:00" + "time": "2023-10-03T13:15:12+00:00" }, { "name": "gitonomy/gitlib", @@ -5108,16 +5108,16 @@ }, { "name": "justinrainbow/json-schema", - "version": "5.2.12", + "version": "v5.2.13", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60" + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", - "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", "shasum": "" }, "require": { @@ -5172,22 +5172,22 @@ ], "support": { "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12" + "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13" }, - "time": "2022-04-13T08:02:27+00:00" + "time": "2023-09-26T02:20:38+00:00" }, { "name": "knplabs/github-api", - "version": "v3.11.0", + "version": "v3.12.0", "source": { "type": "git", "url": "https://github.com/KnpLabs/php-github-api.git", - "reference": "c68b874ac3267c3cc0544b726dbb4e49a72a9920" + "reference": "b50fc1f40bb5ac50957d32c5732fcde9167ac30a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KnpLabs/php-github-api/zipball/c68b874ac3267c3cc0544b726dbb4e49a72a9920", - "reference": "c68b874ac3267c3cc0544b726dbb4e49a72a9920", + "url": "https://api.github.com/repos/KnpLabs/php-github-api/zipball/b50fc1f40bb5ac50957d32c5732fcde9167ac30a", + "reference": "b50fc1f40bb5ac50957d32c5732fcde9167ac30a", "shasum": "" }, "require": { @@ -5201,7 +5201,7 @@ "psr/cache": "^1.0|^2.0|^3.0", "psr/http-client-implementation": "^1.0", "psr/http-factory-implementation": "^1.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.0|^2.0", "symfony/deprecation-contracts": "^2.2|^3.0", "symfony/polyfill-php80": "^1.17" }, @@ -5221,7 +5221,7 @@ "extra": { "branch-alias": { "dev-2.x": "2.20.x-dev", - "dev-master": "3.10.x-dev" + "dev-master": "3.11.x-dev" } }, "autoload": { @@ -5254,7 +5254,7 @@ ], "support": { "issues": "https://github.com/KnpLabs/php-github-api/issues", - "source": "https://github.com/KnpLabs/php-github-api/tree/v3.11.0" + "source": "https://github.com/KnpLabs/php-github-api/tree/v3.12.0" }, "funding": [ { @@ -5262,7 +5262,7 @@ "type": "github" } ], - "time": "2023-03-10T11:40:14+00:00" + "time": "2023-09-30T16:42:04+00:00" }, { "name": "nikic/php-parser", @@ -6596,31 +6596,26 @@ }, { "name": "php-http/promise", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/php-http/promise.git", - "reference": "4c4c1f9b7289a2ec57cde7f1e9762a5789506f88" + "reference": "ef4905bfb492ff389eb7f12e26925a0f20073050" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/promise/zipball/4c4c1f9b7289a2ec57cde7f1e9762a5789506f88", - "reference": "4c4c1f9b7289a2ec57cde7f1e9762a5789506f88", + "url": "https://api.github.com/repos/php-http/promise/zipball/ef4905bfb492ff389eb7f12e26925a0f20073050", + "reference": "ef4905bfb492ff389eb7f12e26925a0f20073050", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "friends-of-phpspec/phpspec-code-coverage": "^4.3.2", - "phpspec/phpspec": "^5.1.2 || ^6.2" + "friends-of-phpspec/phpspec-code-coverage": "^4.3.2 || ^6.3", + "phpspec/phpspec": "^5.1.2 || ^6.2 || ^7.4" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, "autoload": { "psr-4": { "Http\\Promise\\": "src/" @@ -6647,9 +6642,9 @@ ], "support": { "issues": "https://github.com/php-http/promise/issues", - "source": "https://github.com/php-http/promise/tree/1.1.0" + "source": "https://github.com/php-http/promise/tree/1.2.0" }, - "time": "2020-07-07T09:29:14+00:00" + "time": "2023-10-24T09:20:26+00:00" }, { "name": "psr/cache", @@ -6750,16 +6745,16 @@ }, { "name": "psr/http-client", - "version": "1.0.2", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/php-fig/http-client.git", - "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31" + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31", - "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90", "shasum": "" }, "require": { @@ -6796,9 +6791,9 @@ "psr-18" ], "support": { - "source": "https://github.com/php-fig/http-client/tree/1.0.2" + "source": "https://github.com/php-fig/http-client" }, - "time": "2023-04-10T20:12:12+00:00" + "time": "2023-09-23T14:17:50+00:00" }, { "name": "psr/http-factory", @@ -6960,16 +6955,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.20", + "version": "v0.11.22", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "0fa27040553d1d280a67a4393194df5228afea5b" + "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/0fa27040553d1d280a67a4393194df5228afea5b", - "reference": "0fa27040553d1d280a67a4393194df5228afea5b", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/128fa1b608be651999ed9789c95e6e2a31b5802b", + "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b", "shasum": "" }, "require": { @@ -6998,7 +6993,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "0.11.x-dev" + "dev-0.11": "0.11.x-dev" + }, + "bamarni-bin": { + "bin-links": false, + "forward-command": false } }, "autoload": { @@ -7030,9 +7029,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.20" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.22" }, - "time": "2023-07-31T14:32:22+00:00" + "time": "2023-10-14T21:56:36+00:00" }, { "name": "pyrech/composer-changelogs", @@ -9043,16 +9042,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.28", + "version": "v5.4.29", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "684b36ff415e1381d4a943c3ca2502cd2debad73" + "reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/684b36ff415e1381d4a943c3ca2502cd2debad73", - "reference": "684b36ff415e1381d4a943c3ca2502cd2debad73", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6172e4ae3534d25ee9e07eb487c20be7760fcc65", + "reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65", "shasum": "" }, "require": { @@ -9112,7 +9111,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.28" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.29" }, "funding": [ { @@ -9128,7 +9127,7 @@ "type": "tidelift" } ], - "time": "2023-08-24T13:38:36+00:00" + "time": "2023-09-12T10:09:58+00:00" }, { "name": "symfony/yaml", From 5dc24dbf0c0b0b44f78c529ae42d22579fe44005 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Wed, 25 Oct 2023 15:20:37 -0400 Subject: [PATCH 4/6] Add php-zip. --- roles/opendevshop.apache/vars/Debian.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/opendevshop.apache/vars/Debian.yml b/roles/opendevshop.apache/vars/Debian.yml index 4ab9f911b..4507a5e8c 100644 --- a/roles/opendevshop.apache/vars/Debian.yml +++ b/roles/opendevshop.apache/vars/Debian.yml @@ -20,6 +20,7 @@ php_packages_extra: - libapache2-mod-php8.1 - "php{{ php_version }}-bcmath" - "php{{ php_version }}-intl" + - "php{{ php_version }}-zip" # opendevshop.apache/tasks/main.yml disables all the mods, then enables these. apache_mods_enabled: From b4e64e0cc29ff5d7cd9361140cc7ab8fe10de64c Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Wed, 25 Oct 2023 16:35:57 -0400 Subject: [PATCH 5/6] Skip running on devshop_remote --- .github/workflows/devshop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/devshop.yml b/.github/workflows/devshop.yml index 99a685907..852baab86 100644 --- a/.github/workflows/devshop.yml +++ b/.github/workflows/devshop.yml @@ -141,7 +141,7 @@ jobs: # Since the container is launched with a new DEVSHOP_DOCKER_COMMAND_RUN, run the default. run: | docker-compose exec -T devshop.server bash -c '${DEFAULT_DEVSHOP_DOCKER_COMMAND_RUN}' - docker-compose exec -T devshop.remote bash -c '${DEFAULT_DEVSHOP_DOCKER_COMMAND_RUN}' +# docker-compose exec -T devshop.remote bash -c '${DEFAULT_DEVSHOP_DOCKER_COMMAND_RUN}' - name: "Test DevShop" working-directory: docker From 0145a63bc08a3948dbd1c9114cbe7ff75be5aa87 Mon Sep 17 00:00:00 2001 From: Jon Pugh Date: Wed, 25 Oct 2023 17:53:03 -0400 Subject: [PATCH 6/6] Composer package updates: Changelogs summary: - drupal/provision updated from 4.0.0-beta18 to 4.0.0-beta19 patch --- src/DevShop/Control/composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/DevShop/Control/composer.lock b/src/DevShop/Control/composer.lock index 2293c0284..529ea868e 100644 --- a/src/DevShop/Control/composer.lock +++ b/src/DevShop/Control/composer.lock @@ -3513,17 +3513,17 @@ }, { "name": "drupal/provision", - "version": "4.0.0-beta18", + "version": "4.0.0-beta19", "source": { "type": "git", "url": "https://git.drupalcode.org/project/provision.git", - "reference": "7.x-4.0-beta18" + "reference": "7.x-4.0-beta19" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/provision-7.x-4.0-beta18.zip", - "reference": "7.x-4.0-beta18", - "shasum": "b869dfacef65abc86eacfbdcacfe052e126a1488" + "url": "https://ftp.drupal.org/files/projects/provision-7.x-4.0-beta19.zip", + "reference": "7.x-4.0-beta19", + "shasum": "eb693caa71b112fefdea2503a7dab82f0ffd31e0" }, "require": { "devshop/git-traits": "1.x-dev", @@ -3539,8 +3539,8 @@ "type": "drupal-drush", "extra": { "drupal": { - "version": "7.x-4.0-beta18", - "datestamp": "1698242909", + "version": "7.x-4.0-beta19", + "datestamp": "1698268410", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories."