Skip to content

Commit

Permalink
Merge pull request #1 from cthit/extension/case-insensitive-search
Browse files Browse the repository at this point in the history
Add workflows, install TitleKey
  • Loading branch information
GAsplund authored Apr 11, 2024
2 parents 0bbf101 + b629427 commit ddae14b
Show file tree
Hide file tree
Showing 4 changed files with 87 additions and 5 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/build-mediawiki.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Build MediaWiki

on:
push:
branches: [master]
pull_request:
branches: [master]

env:
WORKFLOW_NODE_VERSION: 20.x

jobs:
build:
name: Build docker container

runs-on: ubuntu-latest

steps:
-
uses: actions/checkout@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
-
name: Login to GitHub Container Registry
if: ${{ github.ref == 'refs/heads/master' }}
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build Docker image (and push on master)
uses: docker/build-push-action@v4.0.0
with:
push: ${{ github.ref == 'refs/heads/master' }}
tags: ghcr.io/cthit/mediawiki-gamma:latest
context: ./mediawiki
38 changes: 38 additions & 0 deletions .github/workflows/build-proxy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Build Proxy

on:
push:
branches: [master]
pull_request:
branches: [master]

env:
WORKFLOW_NODE_VERSION: 20.x

jobs:
build:
name: Build docker container

runs-on: ubuntu-latest

steps:
-
uses: actions/checkout@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
-
name: Login to GitHub Container Registry
if: ${{ github.ref == 'refs/heads/master' }}
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Build Docker image (and push on master)
uses: docker/build-push-action@v4.0.0
with:
push: ${{ github.ref == 'refs/heads/master' }}
tags: ghcr.io/cthit/mediawiki-gamma-proxy:latest
context: ./proxy
14 changes: 10 additions & 4 deletions mediawiki/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mediawiki:1.35
FROM mediawiki:1.39

# Various dependencies for composer
RUN apt update && apt install zip unzip
Expand All @@ -13,7 +13,7 @@ COPY ./LocalSettings.php /var/www/html/
WORKDIR /var/www/html/extensions
RUN git clone https://github.com/cthit/MW-OAuth2Client-Gamma
WORKDIR /var/www/html/extensions/MW-OAuth2Client-Gamma
RUN git checkout 89da9b3
RUN git checkout 5f553cc
RUN git submodule update --init --recursive
WORKDIR /var/www/html/extensions/MW-OAuth2Client-Gamma/vendors/oauth2-client
RUN composer install
Expand All @@ -24,8 +24,14 @@ RUN git clone https://github.com/Wikimedica/mediawiki-extensions-GetUserName Get
WORKDIR /var/www/html/extensions/GetUserName
RUN git checkout 4306000

# Install ParserFunctions for MediaWiki 1.35
# Install TitleKey
WORKDIR /var/www/html/extensions
RUN git clone https://github.com/wikimedia/mediawiki-extensions-TitleKey TitleKey
WORKDIR /var/www/html/extensions/TitleKey
RUN git checkout cf26918

# Install ParserFunctions for MediaWiki 1.39
WORKDIR /tmp
RUN curl -L https://extdist.wmflabs.org/dist/extensions/ParserFunctions-REL1_35-ee8b933.tar.gz -o ParserFunctions.tar.gz
RUN curl -L https://extdist.wmflabs.org/dist/extensions/ParserFunctions-REL1_39-6f79511.tar.gz -o ParserFunctions.tar.gz
RUN tar -xzf ParserFunctions.tar.gz -C /var/www/html/extensions
WORKDIR /var/www/html
2 changes: 1 addition & 1 deletion mediawiki/LocalSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@

wfLoadExtension('GetUserName');
wfLoadExtension('ParserFunctions');

wfLoadExtension('TitleKey');

#################################################################################################################################
######################### OAUTH GAMMA ###########################################################################################
Expand Down

0 comments on commit ddae14b

Please sign in to comment.