.gitlab-ci.yml

@@ -11,6 +11,7 @@ include: "https://git.autistici.org/pipelines/containers/raw/master/common.yml"
 test:
   stage: container-test
   image: registry.git.autistici.org/pipelines/images/test/float-podman-runner:master
+  timeout: 30m
   services:
     - name: docker.io/library/memcached:alpine
       alias: memcache
@@ -27,7 +28,7 @@ test:
     - echo -n "$CI_JOB_TOKEN" | podman login -u gitlab-ci-token --password-stdin $CI_REGISTRY
   script:
     - dnf install -y mysql xz git
-    - git clone --depth=1 https://gitlab-ci-token:${CI_JOB_TOKEN}@git.autistici.org/ai3/testdata.git /tmp/testdata.$CI_JOB_ID
+    - git clone --depth=1 https://gitlab-ci-token:${TESTDATA_AUTH_TOKEN}@git.autistici.org/ai3/testdata.git /tmp/testdata.$CI_JOB_ID
     - xzcat /tmp/testdata.$CI_JOB_ID/noblogs/noblogs.sql.xz | mysql --user=root --password=rootpass --host=mysql noblogs
     - for blog in cavallette detriti docs ; do xzcat /tmp/testdata.$CI_JOB_ID/noblogs/noblogs_${blog}.sql.xz | mysql --user=root --password=rootpass --host=mysql noblogs; done
     - with-container --expose=8080 --mount=type=bind,source=docker/test-config.json,destination=/etc/noblogs/config.json --mount=type=tmpfs,destination=/opt/noblogs/www/wp-content/blogs.dir --mount=type=tmpfs,destination=/opt/noblogs/www/wp-content/cache $IMAGE_TAG ./docker/test.sh

composer.json

@@ -90,7 +90,7 @@
         "wpackagist-plugin/simply-exclude": "2.0.6.6",
         "wpackagist-plugin/soundcloud-shortcode": "4.0.3",
         "wpackagist-plugin/squat-radar-calendar-integration": "2.0.9",
-        "wpackagist-plugin/two-factor": "0.11.0",
+        "wpackagist-plugin/two-factor": "0.12.0",
         "wpackagist-plugin/video-sidebar-widgets": "6.1",
         "wpackagist-plugin/wordpress-importer": "0.8.3",
         "wpackagist-plugin/katex": "2.2.3",

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": "5b2a2008a06e7171a0f6c17164a9a852",
+    "content-hash": "40225eb0e2e8333f68b5707b15055d69",
     "packages": [
         {
             "name": "composer/installers",
@@ -1324,15 +1324,15 @@
         },
         {
             "name": "wpackagist-plugin/two-factor",
-            "version": "0.11.0",
+            "version": "0.12.0",
             "source": {
                 "type": "svn",
                 "url": "https://plugins.svn.wordpress.org/two-factor/",
-                "reference": "tags/0.11.0"
+                "reference": "tags/0.12.0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://downloads.wordpress.org/plugin/two-factor.0.11.0.zip"
+                "url": "https://downloads.wordpress.org/plugin/two-factor.0.12.0.zip"
             },
             "require": {
                 "composer/installers": "^1.0 || ^2.0"