diff --git a/.github/actions/pull-ghcr/action.yml b/.github/actions/pull-ghcr/action.yml index 1eea0f6ef..c80f49697 100644 --- a/.github/actions/pull-ghcr/action.yml +++ b/.github/actions/pull-ghcr/action.yml @@ -11,7 +11,6 @@ runs: images=( "wikibase" - "wikibase-lts" "elasticsearch" "wdqs" "wdqs-frontend" diff --git a/.github/workflows/_build_test.yml b/.github/workflows/_build_test.yml index 985bf3b0f..a4b459253 100644 --- a/.github/workflows/_build_test.yml +++ b/.github/workflows/_build_test.yml @@ -24,7 +24,6 @@ jobs: matrix: imageName: - wikibase - - wikibase-lts - elasticsearch - wdqs - wdqs-frontend @@ -50,17 +49,11 @@ jobs: matrix: suite: - repo - - repo-lts - fedprops - - fedprops-lts - repo_client - - repo_client-lts - quickstatements - - quickstatements-lts - pingback - - pingback-lts - elasticsearch - - elasticsearch-lts steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/build_publish_image_release.yml b/.github/workflows/build_publish_image_release.yml index b606ef6f7..4a6440695 100644 --- a/.github/workflows/build_publish_image_release.yml +++ b/.github/workflows/build_publish_image_release.yml @@ -8,7 +8,6 @@ on: - 'wdqs@*' - 'wdqs-frontend@*' - 'wikibase@*' - - 'wikibase-lts@*' permissions: contents: write diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index a83149699..5b2e0f9dc 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -10,13 +10,11 @@ on: default: 'wikibase' options: - deploy - - deploy-lts - elasticsearch - quickstatements - wdqs - wdqs-frontend - wikibase - - wikibase-lts - All projects with unreleased changes dry_run: description: "Dry run, don't do it yet." diff --git a/build/build.sh b/build/build.sh index 0cf3fdf46..12ca5787d 100755 --- a/build/build.sh +++ b/build/build.sh @@ -78,10 +78,6 @@ if [ "$PUBLISH" == true ]; then # IMAGE_REGISTRY implies dockerhub if empty IMAGE_NAMESPACE=wikibase - # Removes "-lts" from end of name if it exists. - # LTS products are published on Dockerhub on the main image name - IMAGE_NAME=${IMAGE_NAME%-lts} - # build/test in CI elif [ "$GITHUB_ACTIONS" == true ]; then IMAGE_REGISTRY=ghcr.io diff --git a/build/wikibase-lts/CHANGELOG.md b/build/wikibase-lts/CHANGELOG.md deleted file mode 100644 index 396674494..000000000 --- a/build/wikibase-lts/CHANGELOG.md +++ /dev/null @@ -1,25 +0,0 @@ -## 1.0.2 (2025-02-24) - - -### 🏡 Chore - -- bump mediawiki to 1.39.11 - -- bump php to 8.3.16 - -- bump mediawiki extensions - -## 1.0.1 (2025-01-21) - - -### 🏡 Chore - -- Bump MediaWiki to 1.39.10 -- Bump extensions -- Removes re-installation of extensions already packaged with MediaWiki (ConfirmEdit, Nuke, Scribunto, SyntaxHighlight_Geshi, VisualEditor) - -### 📖 Documentation - -- Link to MediaWiki bundled extensions -- Switch from `.example.com` to `.example` - diff --git a/build/wikibase-lts/Dockerfile b/build/wikibase-lts/Dockerfile deleted file mode 100644 index c0a4ff32a..000000000 --- a/build/wikibase-lts/Dockerfile +++ /dev/null @@ -1,212 +0,0 @@ -# Build configuration -ARG PHP_IMAGE_URL -ARG COMPOSER_IMAGE_URL - -# ########################################################################### -# Based on https://github.com/wikimedia/mediawiki-docker/blob/1161796f04d6a6bcbec9fb4c67a8ce7248392403/1.41/apache/Dockerfile -# hadolint ignore=DL3006 -FROM ${PHP_IMAGE_URL} as mediawiki - -SHELL ["/bin/bash", "-exu", "-c"] - -# System dependencies -RUN apt-get update; \ - apt-get install -y --no-install-recommends \ - git \ - gettext-base \ - librsvg2-bin \ - imagemagick \ - # Required for SyntaxHighlighting - python3 \ - # Required for Scribunto - lua5.1 \ - ; \ - rm -rf /var/lib/apt/lists/* - -# Install the PHP extensions we need -# hadolint ignore=DL4006 -RUN savedAptMark="$(apt-mark showmanual)"; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - libicu-dev \ - libonig-dev \ - libbz2-dev=1.* \ - ; \ - \ - docker-php-ext-install -j "$(nproc)" \ - bz2 \ - calendar \ - intl \ - mbstring \ - mysqli \ - opcache \ - ; \ - \ - pecl install APCu-5.1.21; \ - docker-php-ext-enable \ - apcu \ - ; \ - rm -r /tmp/pear; \ - \ - # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark; \ - ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ - | awk '/=>/ { print $3 }' \ - | sort -u \ - | xargs -r dpkg-query -S \ - | cut -d: -f1 \ - | sort -u \ - | xargs -rt apt-mark manual; \ - \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/* - -# Enable Short URLs -RUN a2enmod rewrite; \ - { \ - echo ""; \ - echo " RewriteEngine On"; \ - echo " RewriteCond %{REQUEST_FILENAME} !-f"; \ - echo " RewriteCond %{REQUEST_FILENAME} !-d"; \ - echo " RewriteRule ^ %{DOCUMENT_ROOT}/index.php [L]"; \ - echo ""; \ - } > "$APACHE_CONFDIR/conf-available/short-url.conf"; \ - a2enconf short-url - -# Enable AllowEncodedSlashes for VisualEditor -RUN sed -i "s/<\/VirtualHost>/\tAllowEncodedSlashes NoDecode\n<\/VirtualHost>/" "$APACHE_CONFDIR/sites-available/000-default.conf" - -# set recommended PHP.ini settings -# see https://secure.php.net/manual/en/opcache.installation.php -RUN { \ - echo 'opcache.memory_consumption=128'; \ - echo 'opcache.interned_strings_buffer=8'; \ - echo 'opcache.max_accelerated_files=4000'; \ - echo 'opcache.revalidate_freq=60'; \ - } > /usr/local/etc/php/conf.d/opcache-recommended.ini - -# MediaWiki setup -WORKDIR /var/www/html -ARG MEDIAWIKI_VERSION -# hadolint ignore=DL4006 -RUN set -eux; \ - curl -fSL "https://releases.wikimedia.org/mediawiki/$(echo ${MEDIAWIKI_VERSION} | cut -d. -f1,2)/mediawiki-${MEDIAWIKI_VERSION}.tar.gz" -o mediawiki.tar.gz; \ - tar -x --strip-components=1 -f mediawiki.tar.gz; \ - rm -r mediawiki.tar.gz; \ - install -d /var/log/mediawiki -o www-data - -# ########################################################################### -# hadolint ignore=DL3006 -FROM ${COMPOSER_IMAGE_URL} as composer - -COPY --from=mediawiki --chown=nobody:nogroup /var/www/html /var/www/html -WORKDIR /var/www/html - -COPY composer.local.json composer.local.json - -# WORKAROUND for https://phabricator.wikimedia.org/T372458 -# Take wikibase submodules from github as phabricator rate limits us -COPY --chown=nobody:nogroup --chmod=755 \ - wikibase-submodules-from-github-instead-of-phabricator.patch \ - /tmp/wikibase-submodules-from-github-instead-of-phabricator.patch -USER root -RUN apt-get update; \ - apt-get install -y --no-install-recommends \ - patch \ - ; \ - rm -rf /var/lib/apt/lists/* -USER nobody - -ARG WIKIBASE_COMMIT -SHELL ["/bin/bash", "-euo", "pipefail", "-c"] -RUN set -x; \ - git clone https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase /var/www/html/extensions/Wikibase && \ - git -C /var/www/html/extensions/Wikibase checkout ${WIKIBASE_COMMIT} && \ - patch -d /var/www/html/extensions/Wikibase -Np1 /usr/local/etc/php/conf.d/error_reporting.ini - -COPY --from=composer --chown=nobody:nogroup /var/www/html /var/www/html - -# Remove world writable flag, in combination with sticky bit it breaks the w link -# https://github.com/wmde/wikibase-release-pipeline/commit/545c7aeec8d0245dc597d500afc934b40e656b3c -# Make upload path writable for the webserver user -RUN chmod o-w /var/www/html && \ - ln -s /var/www/html/ /var/www/html/w && \ - chown www-data /var/www/html/images -R - -COPY wikibase-php.ini /usr/local/etc/php/conf.d/wikibase-php.ini -COPY entrypoint.sh /entrypoint.sh -COPY jobrunner-entrypoint.sh /jobrunner-entrypoint.sh -COPY htaccess /var/www/html/.htaccess -COPY LocalSettings.d LocalSettings.d -COPY default-extra-install.sh /default-extra-install.sh -COPY oauth.ini /templates/oauth.ini -COPY LocalSettings.wbs.php /templates/LocalSettings.wbs.php - -ENV DB_NAME=my_wiki \ - MW_WG_SITENAME=wikibase \ - MW_WG_LANGUAGE_CODE=en \ - ELASTICSEARCH_PORT=9200 - -ENTRYPOINT ["/bin/bash"] -CMD ["/entrypoint.sh"] diff --git a/build/wikibase-lts/LocalSettings.d/20_Wikibase.php b/build/wikibase-lts/LocalSettings.d/20_Wikibase.php deleted file mode 100644 index 7d83db2c3..000000000 --- a/build/wikibase-lts/LocalSettings.d/20_Wikibase.php +++ /dev/null @@ -1,9 +0,0 @@ - 'http://localhost' . $wgScriptPath . '/rest.php', -); diff --git a/build/wikibase-lts/LocalSettings.d/40_cldr.php b/build/wikibase-lts/LocalSettings.d/40_cldr.php deleted file mode 100644 index 4947122e6..000000000 --- a/build/wikibase-lts/LocalSettings.d/40_cldr.php +++ /dev/null @@ -1,5 +0,0 @@ - '/var/log/mediawiki/mw.resourceloader.log', - 'exception' => '/var/log/mediawiki/mw.exception.log', - 'error' => '/var/log/mediawiki/mw.error.log', - 'fatal' => '/var/log/mediawiki/mw.fatal.log', -); -$wgDebugLogFile = '/var/log/mediawiki/mw.debug.log'; - -$wgArticlePath = "/wiki/$1"; - -# Add configuration values here or above which should be set before extensions are loaded - -# Load extensions if present, alphabetically ordered by filename -foreach (glob("LocalSettings.d/*.php") as $filename) -{ - include $filename; -} - -############################################################################## -# End of generated LocalSettings.php -############################################################################## - -# Add configuration values below which should be set after extensions are loaded diff --git a/build/wikibase-lts/README.md b/build/wikibase-lts/README.md deleted file mode 100644 index df9c72b8a..000000000 --- a/build/wikibase-lts/README.md +++ /dev/null @@ -1,173 +0,0 @@ -# Wikibase Suite Wikibase Image - -[Wikibase](https://www.mediawiki.org/wiki/Wikibase) is a MediaWiki extension for working with versioned, semi-structured data in a central repository. - -This image contains the Wikibase extension running on top of MediaWiki. Wikibase and several other extensions are bundled in addition to [those hipped by MediaWiki](https://www.mediawiki.org/wiki/Bundled_extensions_and_skins). The MediaWiki application runs on top of PHP on an Apache web server in a Debian base image. - -> 💡 This image is part of Wikibase Suite (WBS). [WBS Deploy](https://github.com/wmde/wikibase-release-pipeline/deploy/README.md) provides everything you need to self-host a Wikibase instance out of the box. - -| Bundled Extension | Description | -| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ | -| [Babel](https://www.mediawiki.org/wiki/Extension:Babel) | Adds a parser function to inform other users about language proficiency and categorize users of the same levels and languages. | -| [CLDR](https://www.mediawiki.org/wiki/Extension:CLDR) | Provides functions to localize the names of languages, countries, currencies, and time units based on their language code. | -| [Elastica](https://www.mediawiki.org/wiki/Extension:Elastica), [CirrusSearch](https://www.mediawiki.org/wiki/Extension:CirrusSearch), [WikibaseCirrusSearch](https://www.mediawiki.org/wiki/Extension:WikibaseCirrusSearch) | Elasticsearch integration for MediaWiki and Wikibase. | -| [EntitySchema](https://www.mediawiki.org/wiki/Extension:EntitySchema) | Allows to store Shape Expression Schemas on wiki pages. | -| [OAuth](https://www.mediawiki.org/wiki/Extension:OAuth) | Allow users to safely authorize another application ("consumer") to use the MediaWiki action API on their behalf. | -| [UniversalLanguageSelector](https://www.mediawiki.org/wiki/Extension:UniversalLanguageSelector) | Tool that allows users to select a language and configure its support in an easy way. | -| [WikibaseEdtf](https://github.com/ProfessionalWiki/WikibaseEdtf) | Adds support for the Extended Date/Time Format (EDTF) Specification via a new data type. | -| [WikibaseLocalMedia](https://github.com/ProfessionalWiki/WikibaseLocalMedia) | Adds support for local media files to Wikibase via a new data type. | -| [WikibaseManifest](https://www.mediawiki.org/wiki/Extension:WikibaseManifest) | API-provided metadata for structured data repository. | - -## Requirements - -In order to run Wikibase, you need: - -- Database -- Configuration volume -- Initial settings via environment variables -- Job runner - -### Database - -This is the database MediaWiki will connect to and store all its data in. Technically, MediaWiki supports multiple database engines, but MariaDB is the most commonly used. This is also the only engine used to test the image before release. - -### Configuration volume - -MediaWiki will generate a `LocalSettings.php` file on first launch. Once this file has been generated, you own and control it. This file is stored in the configuration volume. - -### Environment variables for initial settings - -These variables are only respected on first launch in order to generate MediaWiki's `LocalSettings.php` file. When launching the image with a `LocalSettings.php` file present in the configuration volume, environment variables will not be taken into account. - -Variables in **bold** are required on first launch without `LocalSettings.php` in the configuration volume. The image will fail to start if one of those variables does not have a value. Default values do not need to be overwritten. - -| Variable | Default | Description | -| ---------------------------- | ---------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| **`DB_SERVER`** | undefined | Hostname and port for the MySQL server to use for MediaWiki & Wikibase | -| **`DB_USER`** | undefined | Username to use for the MySQL server | -| **`DB_PASS`** | undefined | Password to use for the MySQL server | -| **`DB_NAME`** | "my_wiki" | Database name to use for the MySQL server | -| **`MW_ADMIN_NAME`** | undefined | Admin username to create on MediaWiki first install | -| **`MW_ADMIN_PASS`** | undefined | Admin password to use for admin account on first install | -| **`MW_ADMIN_EMAIL`** | undefined | Admin password to use for admin account on first install | -| **`MW_WG_SERVER`** | undefined | `$wgServer` to use for MediaWiki. A value matching how this site is accessed from the user's browser is required. | -| **`MW_WG_SITENAME`** | "wikibase" | `$wgSitename` to use for MediaWiki | -| **`MW_WG_LANGUAGE_CODE`** | "en" | `$wgLanguageCode` to use for MediaWiki | -| `ELASTICSEARCH_HOST` | undefined | Hostname of an Elasticsearch server with the Wikibase extension installed, such as [wikibase/elasticsearch](https://hub.docker.com/r/wikibase/elasticsearch). Leave this undefined to disable Elasticsearch. | -| `ELASTICSEARCH_PORT` | 9200 | Port on which Elasticsearch is available | -| `QUICKSTATEMENTS_PUBLIC_URL` | undefined | Public URL of the QuickStatements server, such as [wikibase/quickstatements](https://hub.docker.com/r/wikibase/quickstatements). Leave undefined to disable QuickStatements functionality. | - -### Job runner - -MediaWiki/Wikibase depends on [jobs being run in the background](https://www.mediawiki.org/wiki/Manual:Job_queue). This can be either done on HTTP request or by a dedicated job runner. The default configuration of this image requires an external job runner like this. - -To set up an external job runner, use this image for a second container, overwrite the command to `/jobrunner-entrypoint.sh` and share the same configuration volume with it. - -## Example - -Here's an example of how to run this image together with the [WBS Wikibase image](https://hub.docker.com/r/wikibase/wikibase) using Docker Compose. - -```yml -services: - wikibase: - image: wikibase/wikibase - ports: - - 80:80 - volumes: - - ./config:/config - - wikibase-image-data:/var/www/html/images - environment: - MW_ADMIN_NAME: "admin" - MW_ADMIN_PASS: "change-this-password" - MW_ADMIN_EMAIL: "admin@wikibase.example" - MW_WG_SERVER: http://localhost - DB_SERVER: mysql:3306 - DB_NAME: "my_wiki" - DB_USER: "mariadb-user" - DB_PASS: "change-this-password" - healthcheck: - test: curl --silent --fail localhost/wiki/Main_Page - interval: 10s - start_period: 5m - depends_on: - mysql: - condition: service_healthy - restart: unless-stopped - - wikibase-jobrunner: - image: wikibase/wikibase - volumes_from: - - wikibase - command: /jobrunner-entrypoint.sh - depends_on: - wikibase: - condition: service_healthy - restart: always - - mysql: - image: mariadb:10.11 - volumes: - - mysql-data:/var/lib/mysql - environment: - MYSQL_DATABASE: "my_wiki" - MYSQL_USER: "mariadb-user" - MYSQL_PASSWORD: "change-this-password" - MYSQL_RANDOM_ROOT_PASSWORD: yes - healthcheck: - test: healthcheck.sh --connect --innodb_initialized - start_period: 1m - interval: 20s - timeout: 5s - restart: unless-stopped - -volumes: - wikibase-image-data: - mysql-data: -``` - -## Releases - -Official releases of this image can be found on [Docker Hub wikibase/wikibase](https://hub.docker.com/r/wikibase/wikibase). - -## Tags and versioning - -This Wikibase image is using [semantic versioning](https://semver.org/spec/v2.0.0.html). - -We provide several tags that relate to the versioning semantics. - -| Tag | Example | Description | -| ----------------------------------------------- | ------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| _MAJOR_ | 3 | Tags the latest image with this major version. Gets overwritten whenever a new version is released with this major version. This will include new builds triggered by base image changes, patch version updates and minor version updates. | -| _MAJOR_._MINOR_ | 3.1 | Tags the latest image with this major and minor version. Gets overwritten whenever a new version is released with this major and minor version. This will include new builds triggered by base image changes and patch version updates. | -| _MAJOR_._MINOR_._PATCH_ | 3.1.7 | Tags the latest image with this major, minor and patch version. Gets overwritten whenever a new version is released with this major, minor and patch version. This only happens for new builds triggered by base image changes. | -| _MAJOR_._MINOR_._PATCH_\_mw*MW-VERSION* | 3.1.7_mw1.41.1 | Same as above, but also mentioning the current MediaWiki version. | -| _MAJOR_._MINOR_._PATCH_\_build*BUILD-TIMESTAMP* | 3.1.7_build20240530103941 | Tag that never gets overwritten. Every image will have this tag with a unique build timestamp. Can be used to reference images explicitly for reproducibility. | - -## Internal filesystem layout - -Hooking into the internal filesystem can extend the functionality of this image. - -| Directory | Description | -| ------------------------------- | -------------------------------------------------------------------------------------------------------------- | -| `/var/www/html` | Base MediaWiki directory | -| `/var/www/html/images` | MediaWiki image and media upload directory | -| `/var/www/html/skins` | MediaWiki skins directory | -| `/var/www/html/extensions` | MediaWiki extensions directory | -| `/var/www/html/LocalSettings.d` | MediaWiki LocalSettings configuration directory, sourced in alphabetical order at the end of LocalSettings.php | -| `/templates/` | Directory containing templates | - -| File | Description | -| ---------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `/default-extra-install.sh` | Script for automatically creating Elasticsearch indices and creating OAuth consumer for QuickStatements | -| `/extra-install.sh` | Optional script for custom functionality to be ran with MediaWiki install (when generating LocalSettings.php) | -| `/templates/LocalSettings.wbs.php` | Wikibase-specific settings appended to the MediaWiki install generated `LocalSettings.php`. Specifically, this loads the Wikibase repo and client as well as all the other bundled extensions. | - -## Source - -This image is built from this [Dockerfile](https://github.com/wmde/wikibase-release-pipeline/blob/main/build/wikibase/Dockerfile). - -## Authors & contact - -This image is maintained by the Wikibase Suite Team at [Wikimedia Germany (WMDE)](https://wikimedia.de). - -If you have questions not listed above or need help, use this [bug report form](https://phabricator.wikimedia.org/maniphest/task/edit/form/129/) to start a conversation with the engineering team. diff --git a/build/wikibase-lts/build.env b/build/wikibase-lts/build.env deleted file mode 100644 index fd0fc0dde..000000000 --- a/build/wikibase-lts/build.env +++ /dev/null @@ -1,77 +0,0 @@ - -# ############################################################################## -# Mediawiki version -# ############################################################################## -# Update only patch versions for security releases. -# Choose latest version for major releases. -# https://releases.wikimedia.org/mediawiki/ -MEDIAWIKI_VERSION=1.39.11 - -# ############################################################################## -# PHP Composer -# ############################################################################## -# Just used for building - PHP's NPM -# Typically, no need to update. -# https://docker-registry.wikimedia.org/releng/composer-php82/tags/ -COMPOSER_IMAGE_URL=docker-registry.wikimedia.org/releng/composer-php82:0.1.1-s2 - -# ############################################################################## -# Third party base images -# ############################################################################## -# Update only patch versions for security releases. -# Choose latest LTS version for major releases. - -# https://www.php.net/supported-versions.php -# https://hub.docker.com/_/php -PHP_IMAGE_URL=php:8.3.16-apache-bookworm - -# https://hub.docker.com/_/debian -DEBIAN_IMAGE_URL=debian:bookworm-slim - -# ****************************************************************************** -# ****************************************************************************** -# Versions below are automatically updated by ../update_commits -# ****************************************************************************** -# ****************************************************************************** - -# ############################################################################## -# WMF maintained extensions -# ############################################################################## -# Updated automatically by ../update_commits -# Versions in REL_ branches ensure compatibility with respective mediawiki versions. -# Shouldn't require much of a review. -# -# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Wikibase/+/refs/heads/REL1_39 -WIKIBASE_COMMIT=e32b4ca2616f92cc679621a2e433f566f61712fe -# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Babel/+/refs/heads/REL1_39 -BABEL_COMMIT=bfec1c91002902888124662f02023236cead842e -# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/cldr/+/refs/heads/REL1_39 -CLDR_COMMIT=685ceb15653c647c6e325f46a1a46c171643e77f -# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/CirrusSearch/+/refs/heads/REL1_39 -CIRRUSSEARCH_COMMIT=124917e8a70887fab7417b471cb6c7e1c89014a6 -# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Elastica/+/refs/heads/REL1_39 -ELASTICA_COMMIT=13b91fc23a8e1b12a128bb129610820df91127c9 -# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/EntitySchema/+/refs/heads/REL1_39 -ENTITYSCHEMA_COMMIT=3db35d9a69929f7d18da3cb9a456457d7f61d517 -# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/OAuth/+/refs/heads/REL1_39 -OAUTH_COMMIT=c1b23b25d613488b1ff7cfca74725800f77afcb1 -# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/UniversalLanguageSelector/+/refs/heads/REL1_39 -UNIVERSALLANGUAGESELECTOR_COMMIT=6ef9426f6b7b0cb877db75de17b9000fcac84fe5 -# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseCirrusSearch/+/refs/heads/REL1_39 -WIKIBASECIRRUSSEARCH_COMMIT=564f42559835ec069b7b6fa4bd3be01ec2db0f04 -# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseManifest/+/refs/heads/REL1_39 -WIKIBASEMANIFEST_COMMIT=a9acda8d9f3e671e30fdf14c00570d1b06a763ab - -# ############################################################################## -# Community maintained extensions -# ############################################################################## -# Updated automatically by ../update_commits -# Those extensions follow arbitrary versioning strategies. Their compatibility -# with mediawiki versions has to be checked explicitly. Review carefully. -# -# https://github.com/ProfessionalWiki/WikibaseLocalMedia/commits/master -WIKIBASELOCALMEDIA_COMMIT=83d6b5d930efa262a2b2bd92e9a1f91b0f03c9ff -# https://github.com/ProfessionalWiki/WikibaseEdtf/commits/master -WIKIBASEEDTF_COMMIT=a9ac9442140daef77d57a4b4dc55a922abf9daf1 - -IMAGE_TAGS=( "mw${MEDIAWIKI_VERSION}" ) diff --git a/build/wikibase-lts/composer.local.json b/build/wikibase-lts/composer.local.json deleted file mode 100644 index 796ad0fe7..000000000 --- a/build/wikibase-lts/composer.local.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extra": { - "merge-plugin": { - "include": [ "extensions/*/composer.json", "skins/*/composer.json" ] - } - } -} diff --git a/build/wikibase-lts/default-extra-install.sh b/build/wikibase-lts/default-extra-install.sh deleted file mode 100755 index a1343987c..000000000 --- a/build/wikibase-lts/default-extra-install.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -# Enables and configures elasticsearch index -if [ -z "${ELASTICSEARCH_HOST:-}" ] ; then - echo "Skipping Elasticsearch setup ..." -else - # shellcheck disable=2153 # do not warn about unused variables - php /var/www/html/extensions/CirrusSearch/maintenance/UpdateSearchIndexConfig.php - php /var/www/html/extensions/CirrusSearch/maintenance/ForceSearchIndex.php --skipParse - php /var/www/html/extensions/CirrusSearch/maintenance/ForceSearchIndex.php --skipLinks --indexOnSkip -fi - -# Creates an OAuth consumer for quickstatements -if [ -z "${QUICKSTATEMENTS_PUBLIC_URL:-}" ] ; then - echo "Skipping QuickStatements setup ..." -else - # Attempt to create OAuth consumer for QuickStatements - if php /var/www/html/extensions/OAuth/maintenance/createOAuthConsumer.php \ - --approve \ - --callbackUrl "$QUICKSTATEMENTS_PUBLIC_URL/api.php" \ - --callbackIsPrefix true --user "$MW_ADMIN_NAME" --name QuickStatements --description QuickStatements --version 1.0.1 \ - --grants createeditmovepage --grants editpage --grants highvolume --jsonOnSuccess > /quickstatements/data/qs-oauth.json; then - # Check if JSON file was created - if [[ -f /quickstatements/data/qs-oauth.json ]]; then - OAUTH_CONSUMER_KEY=$(grep -o '"key":"[^"]*' /quickstatements/data/qs-oauth.json | grep -o '[^"]*$') - OAUTH_CONSUMER_SECRET=$(grep -o '"secret":"[^"]*' /quickstatements/data/qs-oauth.json | grep -o '[^"]*$') - - export OAUTH_CONSUMER_KEY - export OAUTH_CONSUMER_SECRET - - envsubst < /templates/oauth.ini > /quickstatements/data/oauth.ini - fi - fi -fi diff --git a/build/wikibase-lts/dockerhub.md b/build/wikibase-lts/dockerhub.md deleted file mode 100644 index de05de866..000000000 --- a/build/wikibase-lts/dockerhub.md +++ /dev/null @@ -1,21 +0,0 @@ -# Wikibase Suite wikibase Image - -Wikibase Suite (WBS) eases self-hosting [Wikibase](https://wikiba.se) in production, allowing you to maintain a knowledge graph similar to [Wikidata](https://www.wikidata.org/wiki/Wikidata:Main_Page). - -If you want to host your own WBS instance, head over to the [WBS Deploy documentation](https://github.com/wmde/wikibase-release-pipeline/blob/main/deploy/README.md). - -# Documentation - -Version specific documentation for this image is hosted in our [git repository](https://github.com/wmde/wikibase-release-pipeline/). - -## Currently supported versions - -- July 2024 [3.x.x on MediaWiki 1.42](https://github.com/wmde/wikibase-release-pipeline/blob/deploy-3/build/wikibase/README.md) -- July 2024 [2.x.x on MediaWiki 1.41](https://github.com/wmde/wikibase-release-pipeline/blob/deploy-2/build/wikibase/README.md) -- July 2024 [1.x.x on MediaWiki 1.39](https://github.com/wmde/wikibase-release-pipeline/blob/deploy-1/build/wikibase/README.md) - -## Legacy versions - -- 17 April 2024 [1.41.1-wmde.20](https://github.com/wmde/wikibase-release-pipeline/blob/wmde.20/build/wikibase/README.md) -- 17 April 2024 [1.40.3-wmde.19](https://github.com/wmde/wikibase-release-pipeline/blob/wmde.19/build/wikibase/README.md) -- 29 April 2024 [1.39.7-wmde.18](https://github.com/wmde/wikibase-release-pipeline/blob/wmde.18/build/wikibase/README.md) diff --git a/build/wikibase-lts/entrypoint.sh b/build/wikibase-lts/entrypoint.sh deleted file mode 100644 index 0927d2378..000000000 --- a/build/wikibase-lts/entrypoint.sh +++ /dev/null @@ -1,103 +0,0 @@ -#!/usr/bin/env bash - -# This file is provided by the wikibase/wikibase docker image. - -# Exit immediately with message if no /config volume is available -if [ ! -d "/config" ]; then - echo "A volume mapped to /config is required." - exit 1 -fi - -# Exit immediate on errors or unset variables from here onwards -set -eu - -# Take wikibase-php.ini from user config if present -if [ -e "/config/wikibase-php.ini" ]; then - cp /config/wikibase-php.ini /usr/local/etc/php/conf.d/wikibase-php.ini - -# Otherwise, make our stock wikibase-php.ini visible to the user for customization -else - cp /usr/local/etc/php/conf.d/wikibase-php.ini /config/wikibase-php.ini -fi - -if [ -e "/config/LocalSettings.php" ]; then - cp /config/LocalSettings.php /var/www/html/LocalSettings.php - # Always run update (this might be the first run off of a new image version on existing config and data) - # TODO: Switch to the new way of running maintenance scripts after dropping 1.39 support end of 2025 - #php /var/www/html/maintenance/run.php update --quick - php /var/www/html/maintenance/update.php --quick -else - echo "/config/LocalSettings.php not found, running MediaWiki install." - - # Check for required env vars - set +u - required_vars=( - DB_SERVER - DB_PASS - DB_USER - DB_NAME - MW_ADMIN_NAME - MW_ADMIN_EMAIL - MW_ADMIN_PASS - MW_WG_SERVER - MW_WG_LANGUAGE_CODE - MW_WG_SITENAME - ) - for var in "${required_vars[@]}"; do - if [ -z "${!var}" ]; then - echo "$var is required but isn't set. You should pass it to Docker. See: https://docs.docker.com/engine/reference/commandline/run/#set-environment-variables--e---env---env-file" - exit 1 - fi - done - set -u - - # Run MediaWiki install script, and update values - # TODO: Switch to the new way of running maintenance scripts after dropping 1.39 support end of 2025 - #php /var/www/html/maintenance/run.php install \ - php /var/www/html/maintenance/install.php \ - --server "$MW_WG_SERVER" \ - --scriptpath "/w" \ - --dbuser "$DB_USER" \ - --dbpass "$DB_PASS" \ - --dbname "$DB_NAME" \ - --dbserver "$DB_SERVER" \ - --pass "$MW_ADMIN_PASS" \ - --lang "$MW_WG_LANGUAGE_CODE" \ - "$MW_WG_SITENAME" \ - "$MW_ADMIN_NAME" - - # Include WBS customizations to generated LocalSettings.php - { - echo - echo '# Configuration added by Wikibase Suite installer in entrypoint.sh' - echo - if [[ -v ELASTICSEARCH_HOST ]]; then - echo "\$elasticsearchHost = '$ELASTICSEARCH_HOST';" - fi - echo - grep -v "> /var/www/html/LocalSettings.php - - # Replace /config/LocalSettings.php with newly generated LocalSettings.php - cp /var/www/html/LocalSettings.php /config/LocalSettings.php - # Update the MW Admin email address (if this admin user doesn't already exist, a new one will be created) - # TODO: Switch to the new way of running maintenance scripts after dropping 1.39 support end of 2025 - #php /var/www/html/maintenance/run.php resetUserEmail --no-reset-password "$MW_ADMIN_NAME" "$MW_ADMIN_EMAIL" - php /var/www/html/maintenance/resetUserEmail.php --no-reset-password "$MW_ADMIN_NAME" "$MW_ADMIN_EMAIL" - - # TODO: Switch to the new way of running maintenance scripts after dropping 1.39 support end of 2025 - #php /var/www/html/maintenance/run.php update --quick - php /var/www/html/maintenance/update.php --quick - - if [ -f /default-extra-install.sh ]; then - bash /default-extra-install.sh - fi - - if [ -f /extra-install.sh ]; then - bash /extra-install.sh - fi -fi - -# Run the actual entry point -docker-php-entrypoint apache2-foreground diff --git a/build/wikibase-lts/htaccess b/build/wikibase-lts/htaccess deleted file mode 100644 index 8401c6bc9..000000000 --- a/build/wikibase-lts/htaccess +++ /dev/null @@ -1,15 +0,0 @@ -# This file is provided by the wikibase/wikibase docker image. -## http://www.mediawiki.org/wiki/Manual:Short_URL/Apache - -# Enable the rewrite engine -RewriteEngine On - -# Short url for wiki pages -RewriteRule ^/?wiki(/.*)?$ %{DOCUMENT_ROOT}/w/index.php [L] - -# Redirect / to Main Page -RewriteRule ^/*$ %{DOCUMENT_ROOT}/w/index.php [L] - -# rewrite /entity/ URLs like wikidata per -# https://meta.wikimedia.org/wiki/Wikidata/Notes/URI_scheme -RewriteRule ^/?entity/(.*)$ /wiki/Special:EntityData/$1 [R=303,QSA] diff --git a/build/wikibase-lts/jobrunner-entrypoint.sh b/build/wikibase-lts/jobrunner-entrypoint.sh deleted file mode 100644 index db4dc2de4..000000000 --- a/build/wikibase-lts/jobrunner-entrypoint.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -# Originally inspired by Brennen Bearnes jobrunner entrypoint -# https://gerrit.wikimedia.org/r/plugins/gitiles/releng/dev-images/+/refs/heads/master/common/jobrunner/entrypoint.sh - -kill_runner() { - kill "$PID" 2> /dev/null -} -trap kill_runner SIGTERM - -while true; do - php maintenance/runJobs.php --wait --maxjobs="${JOBRUNNER_MAX_JOBS:-5}" --conf /config/LocalSettings.php & - PID=$! - wait "$PID" -done diff --git a/build/wikibase-lts/oauth.ini b/build/wikibase-lts/oauth.ini deleted file mode 100644 index 557d34adb..000000000 --- a/build/wikibase-lts/oauth.ini +++ /dev/null @@ -1,5 +0,0 @@ -; HTTP User-Agent header -agent = 'Wikibase Docker QuickStatements' -; assigned by Special:OAuthConsumerRegistration (request modelled after https://www.wikidata.org/wiki/Special:OAuthListConsumers/view/77b4ae5506dd7dbb0bb07f80e3ae3ca9) -consumerKey = '${OAUTH_CONSUMER_KEY}' -consumerSecret = '${OAUTH_CONSUMER_SECRET}' diff --git a/build/wikibase-lts/package.json b/build/wikibase-lts/package.json deleted file mode 100644 index 6ef088da6..000000000 --- a/build/wikibase-lts/package.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "wikibase-lts", - "version": "1.0.2", - "nx": { - "targets": { - "lint": {}, - "build": {}, - "nx-release-publish": {}, - "update-commits": {} - } - } -} diff --git a/build/wikibase-lts/wikibase-php.ini b/build/wikibase-lts/wikibase-php.ini deleted file mode 100644 index a6f5aac3c..000000000 --- a/build/wikibase-lts/wikibase-php.ini +++ /dev/null @@ -1,15 +0,0 @@ -; ############################################################################## -; Wikibase Suite PHP settings -; ############################################################################## -; Feel free to adjust those settings according your needs. -; Changes will be picked up automatically by the wikibase container on restart. - -; Set the PHP upload limits be the same as the MediaWiki default of 100M. -; Should match the wgMaxUploadSize setting in LocalSettings.php -file_uploads = On -upload_max_filesize = 100M -post_max_size = 100M - -; Set the PHP memory and execution limits -memory_limit = 100M -max_execution_time = 600 diff --git a/build/wikibase-lts/wikibase-submodules-from-github-instead-of-phabricator.patch b/build/wikibase-lts/wikibase-submodules-from-github-instead-of-phabricator.patch deleted file mode 100644 index f708808c1..000000000 --- a/build/wikibase-lts/wikibase-submodules-from-github-instead-of-phabricator.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/.gitmodules b/.gitmodules -index df41c768af..e9926d6ddd 100644 ---- a/.gitmodules -+++ b/.gitmodules -@@ -3,13 +3,13 @@ - url = https://gerrit.wikimedia.org/r/data-values/value-view - [submodule "view/lib/wikibase-serialization"] - path = view/lib/wikibase-serialization -- url = https://phabricator.wikimedia.org/source/wikibase-serialization.git -+ url = https://github.com/wmde/WikibaseSerializationJavaScript.git - [submodule "view/lib/wikibase-data-values"] - path = view/lib/wikibase-data-values -- url = https://phabricator.wikimedia.org/source/datavalues-javascript.git -+ url = https://github.com/wmde/DataValuesJavaScript.git - [submodule "view/lib/wikibase-data-model"] - path = view/lib/wikibase-data-model -- url = https://phabricator.wikimedia.org/source/wikibase-data-model.git -+ url = https://github.com/wmde/WikibaseDataModelJavaScript.git - [submodule "view/lib/wikibase-termbox"] - path = view/lib/wikibase-termbox - url = https://gerrit.wikimedia.org/r/wikibase/termbox diff --git a/deploy-lts/CHANGELOG.md b/deploy-lts/CHANGELOG.md deleted file mode 100644 index 2a6823d09..000000000 --- a/deploy-lts/CHANGELOG.md +++ /dev/null @@ -1,36 +0,0 @@ -## 1.0.2 (2025-02-24) - -### 🩹 Fixes - -- Remove generated php.ini from deploy-lts config - -### 📖 Documentation - -- update docs to mention version tags - -## 1.0.1 (2025-01-21) - - -### 🩹 Fixes - -- Set traefik restart policy to 'unless-stopped' -- Bump WDQS-Updater version to 2 -- Provide Concept URI to WDQS -- `*_PUBLIC_HOST` URLs default to `.example` TLD from `example.com` -- Removes extra published ports for wikibase, quickstatements, and wdqs-frontend services -- Wikibase waits for Elasticsearch service to be up - -### 📖 Documentation - -- Do not use `--wait` in `docker compose up` in order to see logs -- Link to WDQS updater crash FAQ entry -- Fix to image updating section -- Fix backup script volume names -- Fix link to WDQS readme -- Clarify running locally without DNS -- Add some notes about WDQS-frontend -- Corrected typos - -### 🏡 Chore - -- Add default Traefik LetsEncrypt configuration for services diff --git a/deploy-lts/config/README.md b/deploy-lts/config/README.md deleted file mode 100644 index 83bb3a161..000000000 --- a/deploy-lts/config/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Wikibase Suite Deploy Configuration - -This directory will contain your configuration files after the first run of Wikibase Suite Deploy. Feel free to make adjustments as you see fit. Back up this folder regularly in order to restore your configuration later. - -Find information on how to run Wikibase Suite Deploy in the [top level README](../README.md). diff --git a/deploy-lts/package.json b/deploy-lts/package.json deleted file mode 100644 index b44c5351d..000000000 --- a/deploy-lts/package.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "deploy-lts", - "version": "1.0.2", - "nx": { - "targets": { - "lint": {}, - "nx-release-publish": { - "command": "echo \"⚠️ Make sure to updated related documentation to point to new Deploy release (nothing changed)\"" - } - } - } -} diff --git a/nx.json b/nx.json index 553aa459c..f13f44bb8 100644 --- a/nx.json +++ b/nx.json @@ -27,7 +27,7 @@ "projects": [ "build/*" ] }, "deploy": { - "projects": [ "deploy", "deploy-lts" ] + "projects": [ "deploy" ] } }, "projectsRelationship": "independent", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5aebfedeb..6c6945bac 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -114,12 +114,8 @@ importers: build/wikibase: {} - build/wikibase-lts: {} - deploy: {} - deploy-lts: {} - test: devDependencies: '@types/mocha': diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index d31b9c298..f13886d89 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -2,4 +2,3 @@ packages: - "build/*" - "test/**" - "deploy/**" - - "deploy-lts/**" diff --git a/test/setup/make-test-settings.ts b/test/setup/make-test-settings.ts index 4ba4cbd70..afb4dc9d9 100644 --- a/test/setup/make-test-settings.ts +++ b/test/setup/make-test-settings.ts @@ -118,16 +118,3 @@ export const defaultSettings: Partial = { 'suites/docker-compose.override.yml' ] }; - -export const ltsSettings: Partial = { - envFiles: [ - '../deploy-lts/template.env', - './test-services.env', - '../local.env' - ], - composeFiles: [ - '../deploy-lts/docker-compose.yml', - 'suites/docker-compose.override.yml', - 'suites/docker-compose-lts.override.yml' - ] -}; diff --git a/test/suites/docker-compose-lts.override.yml b/test/suites/docker-compose-lts.override.yml deleted file mode 100644 index d75067cab..000000000 --- a/test/suites/docker-compose-lts.override.yml +++ /dev/null @@ -1,6 +0,0 @@ -services: - wikibase: - image: wikibase/wikibase-lts - - wikibase-jobrunner: - image: wikibase/wikibase-lts diff --git a/test/suites/elasticsearch-lts/elasticsearch-lts.conf.ts b/test/suites/elasticsearch-lts/elasticsearch-lts.conf.ts deleted file mode 100755 index 584fc8f76..000000000 --- a/test/suites/elasticsearch-lts/elasticsearch-lts.conf.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { ltsSettings } from '../../setup/make-test-settings.js'; -import TestEnv from '../../setup/test-env.js'; -import wdioConfig from '../../setup/wdio.conf.js'; - -export const testEnv = TestEnv.create( { - ...ltsSettings, - name: 'elasticsearch-lts', - specs: [ 'specs/elasticsearch/*.ts' ] -} ); - -export const config = wdioConfig( testEnv ); diff --git a/test/suites/fedprops-lts/fedprops-lts.conf.ts b/test/suites/fedprops-lts/fedprops-lts.conf.ts deleted file mode 100755 index 500af143d..000000000 --- a/test/suites/fedprops-lts/fedprops-lts.conf.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { ltsSettings } from '../../setup/make-test-settings.js'; -import TestEnv from '../../setup/test-env.js'; -import wdioConfig from '../../setup/wdio.conf.js'; - -export const testEnv = TestEnv.create( { - ...ltsSettings, - name: 'fedprops-lts', - specs: [ 'specs/fedprops/*.ts' ], - composeFiles: [ - ...ltsSettings.composeFiles, - 'suites/fedprops/docker-compose.override.yml' - ] -} ); - -export const config = wdioConfig( testEnv ); diff --git a/test/suites/pingback-lts/pingback-lts.conf.ts b/test/suites/pingback-lts/pingback-lts.conf.ts deleted file mode 100755 index 173463eea..000000000 --- a/test/suites/pingback-lts/pingback-lts.conf.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { ltsSettings } from '../../setup/make-test-settings.js'; -import TestEnv from '../../setup/test-env.js'; -import wdioConfig from '../../setup/wdio.conf.js'; - -export const testEnv = TestEnv.create( { - ...ltsSettings, - name: 'pingback-lts', - specs: [ 'specs/pingback/*.ts' ], - composeFiles: [ - ...ltsSettings.composeFiles, - 'suites/pingback/docker-compose.override.yml' - ] -} ); - -export const config = wdioConfig( testEnv ); diff --git a/test/suites/quickstatements-lts/quickstatements-lts.conf.ts b/test/suites/quickstatements-lts/quickstatements-lts.conf.ts deleted file mode 100755 index 2bb33577e..000000000 --- a/test/suites/quickstatements-lts/quickstatements-lts.conf.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { ltsSettings } from '../../setup/make-test-settings.js'; -import TestEnv from '../../setup/test-env.js'; -import wdioConfig from '../../setup/wdio.conf.js'; - -export const testEnv = TestEnv.create( { - ...ltsSettings, - name: 'quickstatements-lts', - specs: [ 'specs/quickstatements/*.ts' ], - composeFiles: [ - ...ltsSettings.composeFiles, - 'suites/quickstatements/docker-compose.override.yml' - ] -} ); - -export const config = wdioConfig( testEnv ); diff --git a/test/suites/repo-lts/repo-lts.conf.ts b/test/suites/repo-lts/repo-lts.conf.ts deleted file mode 100755 index e6e9470a0..000000000 --- a/test/suites/repo-lts/repo-lts.conf.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { ltsSettings } from '../../setup/make-test-settings.js'; -import TestEnv from '../../setup/test-env.js'; -import wdioConfig from '../../setup/wdio.conf.js'; - -export const testEnv = TestEnv.create( { - ...ltsSettings, - name: 'repo-lts', - specs: [ 'specs/repo/*.ts', 'specs/repo/extensions/*.ts' ], - envFiles: [ - ...ltsSettings.envFiles, - '../build/wikibase-lts/build.env' // to compare actual MediaWiki version to build - ], - composeFiles: [ - ...ltsSettings.composeFiles, - 'suites/repo/docker-compose.override.yml' - ] -} ); - -export const config = wdioConfig( testEnv ); diff --git a/test/suites/repo_client-lts/docker-compose.override.yml b/test/suites/repo_client-lts/docker-compose.override.yml deleted file mode 100644 index 0b9291cab..000000000 --- a/test/suites/repo_client-lts/docker-compose.override.yml +++ /dev/null @@ -1,3 +0,0 @@ -services: - wikibase-client: - image: wikibase/wikibase-lts diff --git a/test/suites/repo_client-lts/repo_client-lts.conf.ts b/test/suites/repo_client-lts/repo_client-lts.conf.ts deleted file mode 100755 index f475491d5..000000000 --- a/test/suites/repo_client-lts/repo_client-lts.conf.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { ltsSettings } from '../../setup/make-test-settings.js'; -import TestEnv from '../../setup/test-env.js'; -import wdioConfig from '../../setup/wdio.conf.js'; - -export const testEnv = TestEnv.create( { - ...ltsSettings, - name: 'repo_client-lts', - specs: [ 'specs/repo_client/*.ts', 'specs/repo_client/extensions/*.ts' ], - composeFiles: [ - ...ltsSettings.composeFiles, - 'suites/repo_client/docker-compose.override.yml', - 'suites/repo_client-lts/docker-compose.override.yml' - ] -} ); - -export const config = wdioConfig( testEnv );