Merge branch 'staging' into make-epub-read-from-captions

Author: angrave

.github/workflows/ci.yaml

@@ -13,13 +13,13 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '8.0.x' # SDK Version to use; x will use the latest version of the channel
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}

.github/workflows/docker.yaml

@@ -55,7 +55,7 @@ jobs:
             PLATFORM: "linux/amd64"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # calculate some variables that are used later
       - name: version

pythonrpcserver.Dockerfile

@@ -6,8 +6,11 @@
         apt-get install -y curl gcc g++ make libglib2.0-0 libsm6 libxext6 libxrender-dev ffmpeg git
 
     WORKDIR /whisper.cpp
-    RUN git clone https://github.com/ggerganov/whisper.cpp . && make
-    RUN bash ./models/download-ggml-model.sh base.en
+	# RUN git clone https://github.com/ggerganov/whisper.cpp . && make
+    RUN git clone https://github.com/ggerganov/whisper.cpp . && \
+    git checkout 021eef1 && \
+    make
+	RUN bash ./models/download-ggml-model.sh base.en
     RUN bash ./models/download-ggml-model.sh tiny.en
     RUN bash ./models/download-ggml-model.sh large-v3
 
@@ -41,4 +44,4 @@
     CMD [ "nice", "-n", "18", "ionice", "-c", "2", "-n", "6", "python3", "-u", "/PythonRpcServer/server.py" ]
 
 
-    
+