Squashed commit of the following:

commit 30859a5 Author: scossu <[email protected]> Date: Wed Feb 28 22:17:36 2024 -0500 Move ext checkout to github actions. commit 6d8da6d Author: scossu <[email protected]> Date: Wed Feb 28 21:45:01 2024 -0500 Use git clone instead of submodule. commit ade9da5 Author: scossu <[email protected]> Date: Wed Feb 28 21:42:45 2024 -0500 Manually add yiddish submodules. commit 77cb9ef Author: scossu <[email protected]> Date: Wed Feb 28 21:23:37 2024 -0500 Do not remove yiddish module. commit e405b36 Author: scossu <[email protected]> Date: Wed Feb 28 09:11:41 2024 -0500 Fix WORKDIR in Dockerfile commit 95445ba Author: scossu <[email protected]> Date: Wed Feb 28 09:07:50 2024 -0500 Change refs for Yiddish submodules. commit 208ea09 Author: scossu <[email protected]> Date: Wed Feb 28 08:45:58 2024 -0500 Update checkout workflow.
lcnetdev · Feb 29, 2024 · c03330f · c03330f
1 parent 1a2dc25
commit c03330f
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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} .