minor fixes

cociweb · Jan 25, 2024 · 9489661 · 9489661
1 parent 03eff5c
commit 9489661
Show file tree

Hide file tree

Showing 10 changed files with 102 additions and 5 deletions.
diff --git a/.github/workflows/addon-test.yaml b/.github/workflows/addon-test.yaml
@@ -0,0 +1,38 @@
+name: Build and Test Add-on
+
+on:
+  push:
+    branches-ignore:
+      - main
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        addon: ["custom_whisper"]
+        arch: ["aarch64", "amd64"]
+
+    steps:
+      - name: ⤵️ Check out code from GitHub
+        uses: actions/[email protected]
+
+      - name: Get information
+        id: info
+        uses: home-assistant/actions/helpers/info@master
+        with:
+          path: ./${{ matrix.addon }}
+
+      - name: Build ${{ matrix.arch }} add-on
+#        if: github.event_name == 'push' && contains(github.ref, '/tags/v')
+        uses: home-assistant/[email protected]
+        with:
+          args: |
+            --${{ matrix.arch }} \
+            --target ${{matrix.addon}} \
+            --image "${{ matrix.arch }}-addon-whisper" \
+            --docker-hub "ghcr.io/${{ github.repository_owner }}"
+            --test
+
diff --git a/.github/workflows/addon.yaml b/.github/workflows/addon.yaml
@@ -1,4 +1,4 @@
-name: Build Add-on
+name: Build and Publish Add-on
 
 on:
   push:

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -3,8 +3,6 @@ name: Lint Add-on
 on:
   push:
   pull_request:
-    branches:
-      - main
   workflow_dispatch:
 
 jobs:

diff --git a/.github/workflows/standalone-test.yaml b/.github/workflows/standalone-test.yaml
@@ -0,0 +1,51 @@
+name: Build and Test Standalone
+
+on:
+  push:
+    branches-ignore:
+      - main
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  push_to_registries:
+    name: Build Standalone
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+    strategy:
+      matrix:
+        addon: ["standalone_whisper"]
+        device: ["cpu", "cuda"]
+        type: [ {arch: "aarch64", platform: "linux/arm64"}, {arch: "amd64", platform: "linux/amd64"} ]
+
+
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Login to GitHub Container Registry
+        uses: docker/[email protected]
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.ACTION_TOKEN }}
+
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: ${{ matrix.type.arch }}
+
+      - uses: mr-smithers-excellent/docker-build-push@v6
+        name: "Build & push Standalone Docker image: ${{ matrix.type.arch }}-${{ matrix.device }}"
+        with:
+          image: "${{ matrix.type.arch }}_${{ matrix.device }}-${{ matrix.addon }}"
+          dockerfile: "${{ matrix.addon }}/${{ matrix.device }}/${{ matrix.type.arch }}-Dockerfile"
+          tags: latest
+          registry: ghcr.io
+          platform: ${{ matrix.type.platform }}
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.ACTION_TOKEN }}
+          pushImage: false
diff --git a/.github/workflows/standalone.yaml b/.github/workflows/standalone.yaml
@@ -1,4 +1,4 @@
-name: Build Standalone
+name: Build and Publish Standalone
 
 on:
   push:

diff --git a/custom_whisper/Dockerfile b/custom_whisper/Dockerfile
@@ -29,9 +29,11 @@ RUN pip3 install --no-cache-dir -U --upgrade wyoming ctranslate2 tokenizers
 
 WORKDIR /
 ADD https://github.com/rhasspy/wyoming-faster-whisper/archive/refs/tags/v${WYOMING_FASTER_WHISPER_VERSION}.tar.gz wyoming_faster_whisper-${WYOMING_FASTER_WHISPER_VERSION}.tar.gz
+RUN ls -lah
 RUN pip3 install --no-cache-dir wyoming_faster_whisper-${WYOMING_FASTER_WHISPER_VERSION}.tar.gz
 #        "wyoming-faster-whisper==${WYOMING_FASTER_WHISPER_VERSION}"
-WORKDIR /usr/local/lib/python3.11/dist-packages/wyoming_faster_whisper-1.1.0.dist-info/
+WORKDIR /usr/local/lib/python3.11/dist-packages/wyoming_faster_whisper-${WYOMING_FASTER_WHISPER_VERSION}.dist-info/
+RUN ls -lah
 RUN sed -i -e 's/==1.5.2/>=1.5.2/g' \
         -e 's/==0.15.1/>=0.15.1/g' \
         METADATA

diff --git a/standalone_whisper/cpu/aarch64-Dockerfile b/standalone_whisper/cpu/aarch64-Dockerfile
@@ -16,9 +16,11 @@ RUN pip3 install --no-cache-dir -U --upgrade wyoming ctranslate2 tokenizers
 
 WORKDIR /
 ADD https://github.com/rhasspy/wyoming-faster-whisper/archive/refs/tags/v${WYOMING_FASTER_WHISPER_VERSION}.tar.gz wyoming_faster_whisper-${WYOMING_FASTER_WHISPER_VERSION}.tar.gz
+RUN ls -lah
 RUN pip3 install --no-cache-dir wyoming_faster_whisper-${WYOMING_FASTER_WHISPER_VERSION}.tar.gz
 #        "wyoming-faster-whisper==1.1.0"
 WORKDIR /usr/local/lib/python3.11/site-packages/wyoming_faster_whisper-${WYOMING_FASTER_WHISPER_VERSION}.dist-info/
+RUN ls -lah
 RUN sed -i -e 's/==1.5.2/>=1.5.2/g' \
         -e 's/==0.15.1/>=0.15.1/g' \
         METADATA

diff --git a/standalone_whisper/cpu/amd64-Dockerfile b/standalone_whisper/cpu/amd64-Dockerfile
@@ -16,9 +16,11 @@ RUN pip3 install --no-cache-dir -U --upgrade wyoming ctranslate2 tokenizers
 
 WORKDIR /
 ADD https://github.com/rhasspy/wyoming-faster-whisper/archive/refs/tags/v${WYOMING_FASTER_WHISPER_VERSION}.tar.gz wyoming_faster_whisper-${WYOMING_FASTER_WHISPER_VERSION}.tar.gz
+RUN ls -lah
 RUN pip3 install --no-cache-dir wyoming_faster_whisper-${WYOMING_FASTER_WHISPER_VERSION}.tar.gz
 #        "wyoming-faster-whisper==1.1.0"
 WORKDIR /usr/local/lib/python3.11/site-packages/wyoming_faster_whisper-${WYOMING_FASTER_WHISPER_VERSION}.dist-info/
+RUN ls -lah
 RUN sed -i -e 's/==1.5.2/>=1.5.2/g' \
         -e 's/==0.15.1/>=0.15.1/g' \
         METADATA

diff --git a/standalone_whisper/cuda/aarch64-Dockerfile b/standalone_whisper/cuda/aarch64-Dockerfile
@@ -19,9 +19,11 @@ RUN pip3 install --no-cache-dir -U --upgrade wyoming ctranslate2 tokenizers
 
 WORKDIR /
 ADD https://github.com/rhasspy/wyoming-faster-whisper/archive/refs/tags/v${WYOMING_FASTER_WHISPER_VERSION}.tar.gz wyoming_faster_whisper-${WYOMING_FASTER_WHISPER_VERSION}.tar.gz
+RUN ls -lah
 RUN pip3 install --no-cache-dir wyoming_faster_whisper-${WYOMING_FASTER_WHISPER_VERSION}.tar.gz
 #        "wyoming-faster-whisper==1.1.0"
 WORKDIR /usr/local/lib/python3.10/dist-packages/wyoming_faster_whisper-${WYOMING_FASTER_WHISPER_VERSION}.dist-info/
+RUN ls -lah
 RUN sed -i -e 's/==1.5.2/>=1.5.2/g' \
         -e 's/==0.15.1/>=0.15.1/g' \
         METADATA

diff --git a/standalone_whisper/cuda/amd64-Dockerfile b/standalone_whisper/cuda/amd64-Dockerfile
@@ -19,9 +19,11 @@ RUN pip3 install --no-cache-dir -U --upgrade wyoming ctranslate2 tokenizers
 
 WORKDIR /
 ADD https://github.com/rhasspy/wyoming-faster-whisper/archive/refs/tags/v${WYOMING_FASTER_WHISPER_VERSION}.tar.gz wyoming_faster_whisper-${WYOMING_FASTER_WHISPER_VERSION}.tar.gz
+RUN ls -lah
 RUN pip3 install --no-cache-dir wyoming_faster_whisper-${WYOMING_FASTER_WHISPER_VERSION}.tar.gz
 #        "wyoming-faster-whisper==1.1.0"
 WORKDIR /usr/local/lib/python3.10/dist-packages/wyoming_faster_whisper-${WYOMING_FASTER_WHISPER_VERSION}.dist-info/
+RUN ls -lah
 RUN sed -i -e 's/==1.5.2/>=1.5.2/g' \
         -e 's/==0.15.1/>=0.15.1/g' \
         METADATA
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,8 +3,6 @@ name: Lint Add-on @@
     on:
       push:
       pull_request:
-        branches:
-          - main
       workflow_dispatch:
     jobs:
@@ Expand Down @@