Skip to content

Commit

Permalink
T372458: Fix Wikibase build (patch to take submodules from github) (#753
Browse files Browse the repository at this point in the history
)

* fix: use submodules from github

* fix: switch path

* debug: do not build quiet

* debug: patching

* fix: install patch

* Revert "debug: do not build quiet"

This reverts commit fd60f03.

* docs: document workaround

* chore: cleanup
  • Loading branch information
rti authored Aug 15, 2024
1 parent 538eb4c commit 9d69632
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 1 deletion.
19 changes: 18 additions & 1 deletion build/Wikibase/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,26 @@ 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
RUN git clone https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase /var/www/html/extensions/Wikibase && \
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 </tmp/wikibase-submodules-from-github-instead-of-phabricator.patch && \
rm /tmp/wikibase-submodules-from-github-instead-of-phabricator.patch && \
git -C /var/www/html/extensions/Wikibase submodule update --init --recursive && \
rm -f /var/www/html/extensions/Wikibase/.travis.yml && \
find /var/www/html/extensions/Wikibase -name ".git*" -exec rm -rf {} +
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
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

0 comments on commit 9d69632

Please sign in to comment.