From c03330f5f394e2c98bdc67c6417767b7f8762193 Mon Sep 17 00:00:00 2001
From: scossu <stefano@cossu.cc>
Date: Thu, 29 Feb 2024 08:31:37 -0500
Subject: [PATCH] Squashed commit of the following:

commit 30859a52b9cc325c323b414133856d0af3ffc2a6
Author: scossu <stefano@cossu.cc>
Date:   Wed Feb 28 22:17:36 2024 -0500

    Move ext checkout to github actions.

commit 6d8da6df68ac764f90deb15861089095043fd4ba
Author: scossu <stefano@cossu.cc>
Date:   Wed Feb 28 21:45:01 2024 -0500

    Use git clone instead of submodule.

commit ade9da589179870d331b703ff526d7fff33e88bb
Author: scossu <stefano@cossu.cc>
Date:   Wed Feb 28 21:42:45 2024 -0500

    Manually add yiddish submodules.

commit 77cb9ef2959f611d0220cc405e0b584ece71147c
Author: scossu <stefano@cossu.cc>
Date:   Wed Feb 28 21:23:37 2024 -0500

    Do not remove yiddish module.

commit e405b3605dd2629ed5557ccc5fdd5fe8812799ed
Author: scossu <stefano@cossu.cc>
Date:   Wed Feb 28 09:11:41 2024 -0500

    Fix WORKDIR in Dockerfile

commit 95445ba642163e28b94df6736ad6946ad7dc76c0
Author: scossu <stefano@cossu.cc>
Date:   Wed Feb 28 09:07:50 2024 -0500

    Change refs for Yiddish submodules.

commit 208ea095e792195981f644497ccd5fcd55e15c1b
Author: scossu <stefano@cossu.cc>
Date:   Wed Feb 28 08:45:58 2024 -0500

    Update checkout workflow.
---
 .github/workflows/push-docker-image.yml | 15 ++++++++++++++-
 .github/workflows/push-test-image.yml   | 15 ++++++++++++++-
 .gitmodules                             |  2 +-
 Dockerfile                              |  3 +--
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/push-docker-image.yml b/.github/workflows/push-docker-image.yml
index 193f205..06d2709 100644
--- a/.github/workflows/push-docker-image.yml
+++ b/.github/workflows/push-docker-image.yml
@@ -13,10 +13,23 @@ jobs:
   push-image-to-docker-hub:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: checkout repo
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
+      - name: checkout yiddish submodules (1/2)
+        uses: actions/checkout@v4
+        with:
+          repository: ibleaman/loshn-koydesh-pronunciation
+          path: ext/yiddish/yiddish/submodules/loshn-koydesh-pronunciation
+
+      - name: checkout yiddish submodules (2/2)
+        uses: actions/checkout@v4
+        with:
+          repository: ibleaman/hasidify_lexicon
+          path: ext/yiddish/yiddish/submodules/hasidify_lexicon
+
       - name: Build the Docker image
         run: >
           docker build . --tag $DOCKER_USER/$REPO_NAME:${{ github.ref_name }}
diff --git a/.github/workflows/push-test-image.yml b/.github/workflows/push-test-image.yml
index 786b893..538544a 100644
--- a/.github/workflows/push-test-image.yml
+++ b/.github/workflows/push-test-image.yml
@@ -13,10 +13,23 @@ jobs:
   push-image-to-docker-hub:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: checkout repo
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
+      - name: checkout yiddish submodules (1/2)
+        uses: actions/checkout@v4
+        with:
+          repository: ibleaman/loshn-koydesh-pronunciation
+          path: ext/yiddish/yiddish/submodules/loshn-koydesh-pronunciation
+
+      - name: checkout yiddish submodules (2/2)
+        uses: actions/checkout@v4
+        with:
+          repository: ibleaman/hasidify_lexicon
+          path: ext/yiddish/yiddish/submodules/hasidify_lexicon
+
       - name: Build the Docker image
         run: docker build . --tag $DOCKER_USER/$REPO_NAME:test
 
diff --git a/.gitmodules b/.gitmodules
index cc82df3..4d50032 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,5 +3,5 @@
 	url = https://github.com/fadhleryani/Arabic_ALA-LC_Romanization.git
 [submodule "ext/yiddish"]
 	path = ext/yiddish
-	url = https://github.com/ibleaman/yiddish.git
+	url = https://github.com/scossu/yiddish.git
 	branch = loc
diff --git a/Dockerfile b/Dockerfile
index 578751e..7b569e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,18 +10,17 @@ RUN addgroup --system www
 RUN adduser --system www
 RUN gpasswd -a www www
 
+WORKDIR ${_workroot}
 COPY entrypoint.sh uwsgi.ini wsgi.py ./
 COPY ext ./ext/
 COPY scriptshifter ./scriptshifter/
 
-WORKDIR ${_workroot}
 COPY requirements.txt ./
 RUN pip install --no-cache-dir -r requirements.txt
 
 # Remove development packages.
 RUN apt remove -y build-essential git
 RUN apt autoremove -y
-RUN rm -rf ext/yiddish
 
 RUN chmod +x ./entrypoint.sh
 RUN chown -R www:www ${_workroot} .