Преглед изворни кода

Move ext checkout to github actions.

scossu пре 1 година
родитељ
комит
30859a52b9
3 измењених фајлова са 28 додато и 6 уклоњено
  1. 14 1
      .github/workflows/push-docker-image.yml
  2. 14 1
      .github/workflows/push-test-image.yml
  3. 0 4
      Dockerfile

+ 14 - 1
.github/workflows/push-docker-image.yml

@@ -13,10 +13,23 @@ jobs:
   push-image-to-docker-hub:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - 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 }}

+ 14 - 1
.github/workflows/push-test-image.yml

@@ -13,10 +13,23 @@ jobs:
   push-image-to-docker-hub:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - 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
 

+ 0 - 4
Dockerfile

@@ -13,10 +13,6 @@ RUN gpasswd -a www www
 WORKDIR ${_workroot}
 COPY entrypoint.sh uwsgi.ini wsgi.py ./
 COPY ext ./ext/
-# Github actions checkout won't sync these submodules recursively.
-RUN apt install -y git
-RUN git clone https://github.com/ibleaman/loshn-koydesh-pronunciation.git ext/yiddish/yiddish/submodules/loshn-koydesh-pronunciation
-RUN git clone https://github.com/ibleaman/hasidify_lexicon.git yiddish/submodules/hasidify_lexicon
 COPY scriptshifter ./scriptshifter/
 
 COPY requirements.txt ./