Fix some CI issues.

.github/workflows/push-app-image.yml

@@ -6,7 +6,7 @@ on:
     tags:
       - "v*.*.[1-9]*"
   workflow_run:
-    workflows: 
+    workflows:
       - "Push base image"
     types:
       - "completed"
@@ -25,6 +25,11 @@ jobs:
         with:
           submodules: recursive
 
+      - name: update version info
+        run: |
+          git describe --tags >| VERSION
+          git rev-parse HEAD >> VERSION
+
       - name: Build the Docker image
         run: >
           docker build -f Dockerfile .

.github/workflows/push-test-image.yml

@@ -18,6 +18,11 @@ jobs:
         with:
           submodules: recursive
 
+      - name: update version info
+        run: |
+          git describe --tags >| VERSION
+          git rev-parse HEAD >> VERSION
+
       - name: Build the Docker image
         run: >
           docker build -f Dockerfile .
@@ -32,4 +37,3 @@ jobs:
 
       - name: Push to Docker Hub
         run: docker push $DOCKER_USER/$REPO_NAME:test
-

.gitignore

@@ -138,3 +138,4 @@ tags.temp
 # Local
 ext/arabic_rom/data
 !.keep
+VERSION

Dockerfile

@@ -3,7 +3,7 @@ ARG WORKROOT "/usr/local/scriptshifter/src"
 
 # Copy core application files.
 WORKDIR ${WORKROOT}
-COPY entrypoint.sh uwsgi.ini wsgi.py ./
+COPY entrypoint.sh uwsgi.ini wsgi.py VERSION ./
 COPY scriptshifter ./scriptshifter/
 COPY requirements.txt ./
 RUN pip install --no-cache-dir -r requirements.txt

deps.txt

@@ -1,7 +1,5 @@
-# External dependencies.
-aksharamukha>=2.2,<3
+# Base image dependencies.
 camel-tools>=1.5
 funcy>=1.15,<2
 pymarc>=4.0,<5
 repackage>=0.7.3
-./ext/yiddish

requirements.txt

@@ -4,4 +4,3 @@ flask-cors>=4.0,<5
 python-dotenv>=1.0,<2
 pyyaml>=6.0,<7
 uwsgi>=2.0,<2.1
-yiddish==0.0.21