Merge branch 'branches' and wikibase-submodules (#65 and #66)

from femiwiki/.github@8948b97
femiwiki · Sep 21, 2024 · 3ed29af · 3ed29af
1 parent 60c51cf
commit 3ed29af
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 4 deletions.
diff --git a/.github/workflows/extension-test.yml b/.github/workflows/extension-test.yml
@@ -138,7 +138,57 @@ jobs:
             git clone -b "${MEDIAWIKI_VERSION}" --depth 1 https://gerrit.wikimedia.org/r/mediawiki/core src
             git clone --recurse-submodules -b "${MEDIAWIKI_VERSION}" --depth 1 https://gerrit.wikimedia.org/r/mediawiki/skins/Vector src/skins/Vector
             for dep in $DEPENDENCIES; do
-              git clone --recurse-submodules -b "${MEDIAWIKI_VERSION}" --depth 1 "https://gerrit.wikimedia.org/r/${dep}" src/"$(echo $dep | cut -d'/' -f2,3)"
+              if [ "$dep" = 'mediawiki/extensions/Wikibase' ]; then
+                git clone -b "${MEDIAWIKI_VERSION}" --depth 1 "https://gerrit.wikimedia.org/r/${dep}" src/"$(echo $dep | cut -d'/' -f2,3)"
+
+                cd src/"$(echo $dep | cut -d'/' -f2,3)"
+                # https://gerrit.wikimedia.org/r/q/I2037cd8bb5d568021472e048900649028b5dcc62
+                git apply << 'EOF'
+          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
+          EOF
+                git submodule update --init
+                cd -
+              elif [ "$dep" = 'mediawiki/extensions/WikibaseLexeme' ]; then
+                git clone -b "${MEDIAWIKI_VERSION}" --depth 1 "https://gerrit.wikimedia.org/r/${dep}" src/"$(echo $dep | cut -d'/' -f2,3)"
+
+                cd src/"$(echo $dep | cut -d'/' -f2,3)"
+                # https://gerrit.wikimedia.org/r/q/I2037cd8bb5d568021472e048900649028b5dcc62
+                git apply << 'EOF'
+          diff --git a/.gitmodules b/.gitmodules
+          index 51ab4cd..97dff70 100644
+          --- a/.gitmodules
+          +++ b/.gitmodules
+          @@ -1,3 +1,3 @@
+           [submodule "resources/special/new-lexeme"]
+           	path = resources/special/new-lexeme
+          -	url = https://phabricator.wikimedia.org/diffusion/NLSP/new-lexeme-special-page.git
+          +	url = https://github.com/wmde/new-lexeme-special-page.git
+          EOF
+                git submodule update --init
+                cd -
+              else
+                git clone --recurse-submodules -b "${MEDIAWIKI_VERSION}" --depth 1 "https://gerrit.wikimedia.org/r/${dep}" src/"$(echo $dep | cut -d'/' -f2,3)"
+              fi
             done
           fi
           git -C src/ log -n 1 --format="%H"

diff --git a/.github/workflows/release-and-submit.yml b/.github/workflows/release-and-submit.yml
@@ -13,15 +13,15 @@ name: Upload Release Asset and submit a PR to docker-mediawiki repository
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-18.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: '7.3'
           tools: composer:v1
 
       - uses: actions/setup-node@v3
@@ -30,7 +30,7 @@ jobs:
 
       - name: Set tag name
         id: tag_name
-        run: echo "tag_name=$(basename ${{ github.ref }})" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=tag_name::$(basename ${{ github.ref }})"
       - name: Build project
         run: |
           composer update --no-dev