From 256bfc1d7d7b82972d323cb2c56d0fe4fdd1644d Mon Sep 17 00:00:00 2001 From: ale <ale@incal.net> Date: Thu, 16 Jan 2025 13:25:06 +0000 Subject: [PATCH] Upgrade r2db to 0.1.9, fix local mysql addr in ci-test --- .gitlab-ci.yml | 2 ++ composer.json | 2 +- composer.lock | 16 ++++++++-------- docker/test-config.json | 2 ++ 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a24bea1e..8356a735 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,8 @@ test: stage: container-test image: registry.git.autistici.org/pipelines/images/test/float-podman-runner:master services: + - name: docker.io/library/memcache:latest + alias: memcache - name: docker.io/library/mysql:latest alias: mysql tags: [podman] diff --git a/composer.json b/composer.json index deca5770..5238f86b 100644 --- a/composer.json +++ b/composer.json @@ -72,7 +72,7 @@ "wpackagist-theme/wp-andreas01": "2.0", "npm-asset/scriptaculous-js": "1.9.0", "npm-asset/prototype-js-core": "1.7.3", - "noblogs/r2db": "0.1.8", + "noblogs/r2db": "0.1.9", "noblogs/ai-global-activity-plugin": "0.0.24", "noblogs/ai-mu-plugins": "0.4.15", "noblogs/noblogs-wp-ssl": "0.1.0", diff --git a/composer.lock b/composer.lock index 6a80cc44..2e25957b 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": "52e34f831ed12ba8c8a5c1b5499cd0e4", + "content-hash": "e9d92b02c9180669470be08ab8aacce8", "packages": [ { "name": "composer/installers", @@ -461,16 +461,16 @@ }, { "name": "noblogs/r2db", - "version": "0.1.8", + "version": "0.1.9", "source": { "type": "git", "url": "https://git.autistici.org/noblogs/r2db.git", - "reference": "e68d8a91c6f631665569ffbce920991e3d135874" + "reference": "ab2591f8b19c64d8483c15de233183bfe456d35a" }, "dist": { "type": "zip", - "url": "https://git.autistici.org/api/v4/projects/449/packages/composer/archives/noblogs/r2db.zip?sha=e68d8a91c6f631665569ffbce920991e3d135874", - "reference": "e68d8a91c6f631665569ffbce920991e3d135874", + "url": "https://git.autistici.org/api/v4/projects/449/packages/composer/archives/noblogs/r2db.zip?sha=ab2591f8b19c64d8483c15de233183bfe456d35a", + "reference": "ab2591f8b19c64d8483c15de233183bfe456d35a", "shasum": "" }, "require": { @@ -2100,12 +2100,12 @@ "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": {}, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { "php": ">=7.1" }, - "platform-dev": {}, - "plugin-api-version": "2.6.0" + "platform-dev": [], + "plugin-api-version": "2.3.0" } diff --git a/docker/test-config.json b/docker/test-config.json index 85e4eb81..ee951044 100644 --- a/docker/test-config.json +++ b/docker/test-config.json @@ -21,6 +21,7 @@ }, "is_master": true, "master": { + "local_host": "mysql", "host": "mysql", "port": 3306, "user": "root", @@ -28,6 +29,7 @@ "name": "noblogs" } }, + "memcached": ["memcache:11211"], "debug": false, "debug_cookie_name": "__unused__", "local_backend_name": "backend_1" -- GitLab