fix(ignore): Rebuild serialport, attempt to fix #25092

Koenkk · Dec 13, 2024 · 88023e3 · 88023e3
1 parent 2b08c68
commit 88023e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -59,27 +59,27 @@ jobs:
                   password: ${{ secrets.GH_TOKEN }}
 
             - name: Docker setup - QEMU
-              if: (github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/')) && github.event_name == 'push'
+              # if: (github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/')) && github.event_name == 'push'
               uses: docker/setup-qemu-action@v3
               with:
                   platforms: all
 
             - name: Docker setup - Buildx
-              if: (github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/')) && github.event_name == 'push'
+              # if: (github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/')) && github.event_name == 'push'
               id: buildx
               uses: docker/setup-buildx-action@v3
               with:
                   version: latest
 
             - name: dev - Docker build and push
-              if: github.ref == 'refs/heads/dev' && github.event_name == 'push'
+              # if: github.ref == 'refs/heads/dev' && github.event_name == 'push'
               uses: docker/build-push-action@v6
               with:
                   context: .
                   file: docker/Dockerfile
                   platforms: linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7,linux/riscv64,linux/386
                   tags: koenkk/zigbee2mqtt:latest-dev,ghcr.io/koenkk/zigbee2mqtt:latest-dev
-                  push: true
+                  push: false
                   build-args: |
                       COMMIT=${{ github.sha }}
                       VERSION=dev

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -21,7 +21,8 @@ COPY package.json pnpm-lock.yaml ./
 # Make and such are needed to compile serialport for riscv64
 RUN apk add make gcc g++ python3 linux-headers npm && \
     npm install -g pnpm && \
-    pnpm install --frozen-lockfile --no-optional
+    pnpm install --frozen-lockfile --no-optional && \
+    pnpm rebuild
 
 # Release
 FROM base AS release