add ci pipeline for arm7 builds (#472)

Hahihula · web-flow · commit 3b2a659d1765 · 2026-03-03T11:10:05.000+01:00
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -356,6 +356,238 @@ jobs:
           asset_path: rpm_output/*.rpm
           asset_name: eim-cli-${{ matrix.package_name }}.rpm
 
+  build-cli-linux-armv7:
+    name: Build CLI (Linux - linux-armv7)
+    needs: [setup, build-test-lib, build-cli-linux]
+    if: (needs.build-test-lib.result == 'success' || needs.build-test-lib.result == 'skipped') && (needs.build-cli-linux.result == 'success')
+    runs-on: ubuntu-latest
+    env:
+      CROSS_TARGET: armv7-unknown-linux-musleabihf
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: armv7-unknown-linux-musleabihf
+
+      - name: Install cross
+        run: cargo install cross --git https://github.com/cross-rs/cross --tag v0.2.5
+
+      - name: Cache cargo
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+          key: linux-armv7-cargo-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: linux-armv7-cargo-
+
+      - name: Build CLI
+        env:
+          LIBZ_SYS_STATIC: 1
+          ZLIB_STATIC: 1
+          LZMA_API_STATIC: 1
+          APP_INSIGHTS_CONNECTION_STRING: ${{ secrets.APP_INSIGHTS_CONNECTION_STRING }}
+        run: |
+          cd src-tauri
+          cross build --release --no-default-features --features cli --target ${{ env.CROSS_TARGET }}
+        shell: bash
+
+      - name: Create release directory
+        run: mkdir -p release_cli/linux-armv7
+
+      - name: Copy binary
+        run: |
+          cp src-tauri/target/${{ env.CROSS_TARGET }}/release/eim release_cli/linux-armv7/eim
+          chmod +x release_cli/linux-armv7/eim
+          cd release_cli/linux-armv7
+          zip -r eim.zip eim
+        shell: bash
+
+      - name: Download completions from linux-x64 build
+        uses: actions/download-artifact@v4
+        with:
+          name: eim-cli-linux-x64-${{ (github.event_name == 'release' && github.ref_name) || github.run_number }}
+          path: /tmp/x64-cli-artifact/
+
+      - name: Generate Completions from x64 binary
+        shell: bash
+        run: |
+          set -euo pipefail
+          # Completions are architecture-independent (just text from clap),
+          # so we reuse the x64 binary to generate them.
+          X64_BIN="/tmp/x64-cli-artifact/eim"
+          chmod +x "$X64_BIN"
+
+          cd src-tauri
+          OUTDIR="target/${{ env.CROSS_TARGET }}/release/completions"
+          mkdir -p "$OUTDIR"
+
+          "$X64_BIN" completions zsh    > "$OUTDIR/_eim"
+          "$X64_BIN" completions bash   > "$OUTDIR/eim.bash"
+          "$X64_BIN" completions fish   > "$OUTDIR/eim.fish"
+          "$X64_BIN" completions elvish > "$OUTDIR/eim.elv"
+
+          mkdir -p target/release/completions
+          cp -a "$OUTDIR"/. target/release/completions/
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: eim-cli-linux-armv7-${{ (github.event_name == 'release' && github.ref_name) || github.run_number }}
+          path: release_cli/linux-armv7/eim
+
+      - name: Upload Release Asset
+        if: github.event_name == 'release' && github.event.action == 'created'
+        uses: shogo82148/actions-upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: release_cli/linux-armv7/eim.zip
+          asset_name: eim-cli-linux-armv7.zip
+
+      # offline installer
+      - name: Build offline_installer_builder
+        env:
+          LIBZ_SYS_STATIC: 1
+          ZLIB_STATIC: 1
+          LZMA_API_STATIC: 1
+        run: |
+          cd src-tauri
+          cross build --release --no-default-features --features offline --bin offline_installer_builder --target ${{ env.CROSS_TARGET }}
+        shell: bash
+
+      - name: Copy offline_installer_builder binary
+        run: |
+          cp src-tauri/target/${{ env.CROSS_TARGET }}/release/offline_installer_builder release_cli/linux-armv7/offline_installer_builder
+          chmod +x release_cli/linux-armv7/offline_installer_builder
+          cd release_cli/linux-armv7
+          zip -r offline_installer_builder.zip offline_installer_builder
+        shell: bash
+
+      - name: Upload offline_installer_builder artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: offline_installer_builder-linux-armv7-${{ (github.event_name == 'release' && github.ref_name) || github.run_number }}
+          path: release_cli/linux-armv7/offline_installer_builder
+
+      - name: Upload offline_installer_builder Release Asset
+        if: github.event_name == 'release' && github.event.action == 'created'
+        uses: shogo82148/actions-upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: release_cli/linux-armv7/offline_installer_builder.zip
+          asset_name: offline_installer_builder-linux-armv7.zip
+
+      # .deb package
+      - name: Prepare manpage for deb package
+        if: github.event_name == 'release' && github.event.action == 'created'
+        run: |
+          mkdir -p src-tauri/man
+          cp man/eim.1 src-tauri/man/
+        shell: bash
+
+      - name: Build CLI .deb package
+        run: |
+          cd src-tauri
+          cargo install cargo-deb || true
+
+          if [[ "${GITHUB_REF_TYPE}" == "tag" ]]; then
+            VERSION="${GITHUB_REF_NAME#v}"
+          else
+            VERSION="0.0.0-${GITHUB_SHA:0:7}"
+          fi
+
+          echo "Using version: $VERSION"
+
+          cargo deb --no-build --no-strip --no-default-features --features cli \
+            --target ${{ env.CROSS_TARGET }} \
+            --deb-version $VERSION
+        shell: bash
+
+      - name: Upload CLI .deb artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: eim-cli-linux-armv7-${{ (github.event_name == 'release' && github.ref_name) || github.run_number }}-deb
+          path: src-tauri/target/debian/eim*.deb
+          if-no-files-found: warn
+
+      - name: Upload CLI .deb Release Asset
+        if: github.event_name == 'release' && github.event.action == 'created'
+        uses: shogo82148/actions-upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: src-tauri/target/debian/eim*.deb
+          asset_name: eim-cli-linux-armv7.deb
+
+      # .rpm package
+      - name: Build CLI .rpm package
+        run: |
+          cd src-tauri
+          cargo install cargo-generate-rpm || true
+
+          if [[ "${GITHUB_REF_TYPE}" == "tag" ]]; then
+            VERSION="${GITHUB_REF_NAME#v}"
+          else
+            VERSION="0.0.0-${GITHUB_SHA:0:7}"
+          fi
+
+          echo "Using version: $VERSION"
+
+          mkdir -p ~/.rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
+
+          cargo generate-rpm \
+            --target ${{ env.CROSS_TARGET }} \
+            --payload-compress gzip \
+
+          echo "Generated RPM files:"
+          find target -name "*.rpm" -type f
+        shell: bash
+
+      - name: Find and upload RPM artifacts
+        id: find-rpms
+        run: |
+          RPM_DIR="rpm_output"
+          mkdir -p "$RPM_DIR"
+          find src-tauri/target -name "*.rpm" -type f -exec cp {} "$RPM_DIR/" \;
+
+          echo "Contents of $RPM_DIR:"
+          ls -la "$RPM_DIR"/
+
+          if [ -d "$RPM_DIR" ] && [ "$(ls -A $RPM_DIR)" ]; then
+            echo "rpm_files_found=true" >> $GITHUB_OUTPUT
+          else
+            echo "rpm_files_found=false" >> $GITHUB_OUTPUT
+            echo "No RPM files found!" >&2
+            exit 1
+          fi
+
+      - name: Upload RPM artifacts
+        if: steps.find-rpms.outputs.rpm_files_found == 'true'
+        uses: actions/upload-artifact@v4
+        with:
+          name: eim-cli-linux-armv7-${{ (github.event_name == 'release' && github.ref_name) || github.run_number }}-rpm
+          path: rpm_output/*.rpm
+          if-no-files-found: warn
+
+      - name: Upload CLI .rpm Release Asset
+        if: github.event_name == 'release' && github.event.action == 'created' && steps.find-rpms.outputs.rpm_files_found == 'true'
+        uses: shogo82148/actions-upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: rpm_output/*.rpm
+          asset_name: eim-cli-linux-armv7.rpm
+
   build-cli:
     name: Build CLI (${{ matrix.package_name }})
     needs: [setup, build-test-lib]
@@ -673,8 +905,8 @@ jobs:
 
   build-offline-archives:
     name: Build Offline Archives
-    needs: [build-cli, build-cli-linux]
-    if: (needs.build-cli.result == 'success' || needs.build-cli.result == 'skipped') && (needs.build-cli-linux.result == 'success' || needs.build-cli-linux.result == 'skipped') && github.event_name == 'release'
+    needs: [build-cli, build-cli-linux, build-cli-linux-armv7]
+    if: (needs.build-cli.result == 'success' || needs.build-cli.result == 'skipped') && (needs.build-cli-linux.result == 'success' || needs.build-cli-linux.result == 'skipped') && (needs.build-cli-linux-armv7.result == 'success' || needs.build-cli-linux-armv7.result == 'skipped') && github.event_name == 'release'
     uses: ./.github/workflows/build_offline_installer_archives.yaml
     with:
       ref: ${{ github.ref }}
@@ -1048,7 +1280,7 @@ jobs:
 
   Autotest-CLI:
     name: Autotest CLI
-    needs: [build-cli, build-cli-linux]
+    needs: [build-cli, build-cli-linux, build-cli-linux-armv7]
     if: needs.build-cli.result == 'success' && needs.build-cli-linux.result == 'success'
     uses: ./.github/workflows/test_cli.yml
     with:
@@ -1069,7 +1301,7 @@ jobs:
 
   update-release-info:
     name: Update Release Information
-    needs: [build-cli, build-cli-linux, build-gui]
+    needs: [build-cli, build-cli-linux, build-cli-linux-armv7, build-gui]
     runs-on: ubuntu-latest
     if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
     steps:
@@ -1088,7 +1320,7 @@ jobs:
 
   update-homebrew:
     name: Update Homebrew Formula and Cask
-    needs: [build-cli, build-cli-linux, build-gui, update-release-info]
+    needs: [build-cli, build-cli-linux, build-cli-linux-armv7, build-gui, update-release-info]
     uses: ./.github/workflows/update-homebrew.yml
     with:
       version: ${{ github.ref_name }}
@@ -1097,7 +1329,7 @@ jobs:
 
   update-linux-repos:
     name: Update APT and RPM Repositories
-    needs: [build-cli-linux, build-gui, update-release-info]
+    needs: [build-cli-linux, build-cli-linux-armv7, build-gui, update-release-info]
     uses: ./.github/workflows/update-linux-repos.yml
     if: github.event_name == 'release' && github.event.action == 'created'
     with:
diff --git a/.github/workflows/update-linux-repos.yml b/.github/workflows/update-linux-repos.yml
@@ -60,12 +60,20 @@ jobs:
           path: new-debs/
         continue-on-error: true
 
+      - name: Download CLI linux-armv7 .deb artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: eim-cli-linux-armv7-${{ inputs.version }}-deb
+          path: new-debs/
+        continue-on-error: true
+
       - name: Create proper APT repository structure
         run: |
-          # Create proper directory structure
+          # Create proper directory structure (now includes armhf)
           mkdir -p apt-repo/pool/main
           mkdir -p apt-repo/dists/stable/main/binary-amd64
           mkdir -p apt-repo/dists/stable/main/binary-arm64
+          mkdir -p apt-repo/dists/stable/main/binary-armhf
 
           # Sync existing .deb files from S3 pool
           aws s3 sync s3://espdldata/dl/eim/apt/pool/main/ apt-repo/pool/main/ --exclude "*" --include "*.deb" || echo "No existing pool found"
@@ -89,14 +97,18 @@ jobs:
           dpkg-scanpackages --arch arm64 pool/main > dists/stable/main/binary-arm64/Packages
           gzip -k -f dists/stable/main/binary-arm64/Packages
 
-          # Generate Release file
+          # ARMHF packages
+          dpkg-scanpackages --arch armhf pool/main > dists/stable/main/binary-armhf/Packages
+          gzip -k -f dists/stable/main/binary-armhf/Packages
+
+          # Generate Release file (now includes armhf)
           cd dists/stable
           cat > Release << EOF
           Origin: Espressif Systems
           Label: ESP-IDF Installation Manager
           Suite: stable
           Codename: stable
-          Architectures: amd64 arm64
+          Architectures: amd64 arm64 armhf
           Components: main
           Description: ESP-IDF Installation Manager packages
           Date: $(date -Ru)
@@ -156,6 +168,13 @@ jobs:
           path: new-rpms/
         continue-on-error: true
 
+      - name: Download CLI linux-armv7 .rpm artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: eim-cli-linux-armv7-${{ inputs.version }}-rpm
+          path: new-rpms/
+        continue-on-error: true
+
       - name: Download GUI linux-x64 .rpm artifact
         uses: actions/download-artifact@v4
         with:
@@ -172,32 +191,38 @@ jobs:
 
       - name: Create RPM repository structure
         run: |
-          # Create directory structure
+          # Create directory structure (now includes armv7hl)
           mkdir -p rpm-repo/x86_64
           mkdir -p rpm-repo/aarch64
+          mkdir -p rpm-repo/armv7hl
 
           # Sync existing .rpm files from S3
           aws s3 sync s3://espdldata/dl/eim/rpm/x86_64/ rpm-repo/x86_64/ --exclude "*" --include "*.rpm" || echo "No existing x86_64 RPMs found"
           aws s3 sync s3://espdldata/dl/eim/rpm/aarch64/ rpm-repo/aarch64/ --exclude "*" --include "*.rpm" || echo "No existing aarch64 RPMs found"
+          aws s3 sync s3://espdldata/dl/eim/rpm/armv7hl/ rpm-repo/armv7hl/ --exclude "*" --include "*.rpm" || echo "No existing armv7hl RPMs found"
 
           # Debug: Show contents of downloaded RPMs
           echo "Downloaded RPM artifacts:"
           find new-rpms -type f -name "*.rpm" -exec ls -la {} \;
 
           # Copy new .rpm files to appropriate architecture directories
-          # Improved file discovery logic
           if [ -d "new-rpms" ] && [ "$(ls -A new-rpms)" ]; then
             # Copy x86_64 RPMs
             find new-rpms -type f \( -name "*x86_64*.rpm" -o -name "*amd64*.rpm" -o -name "*linux-x64*.rpm" \) -exec cp {} rpm-repo/x86_64/ \; || echo "No x86_64 RPMs to copy"
 
             # Copy aarch64 RPMs
             find new-rpms -type f \( -name "*aarch64*.rpm" -o -name "*arm64*.rpm" -o -name "*linux-aarch64*.rpm" \) -exec cp {} rpm-repo/aarch64/ \; || echo "No aarch64 RPMs to copy"
 
+            # Copy armv7hl RPMs
+            find new-rpms -type f \( -name "*armv7*.rpm" -o -name "*armhf*.rpm" -o -name "*linux-armv7*.rpm" \) -exec cp {} rpm-repo/armv7hl/ \; || echo "No armv7hl RPMs to copy"
+
             echo "Copied RPM files:"
             echo "x86_64 RPMs:"
             ls -la rpm-repo/x86_64/ || echo "No x86_64 RPMs"
             echo "aarch64 RPMs:"
             ls -la rpm-repo/aarch64/ || echo "No aarch64 RPMs"
+            echo "armv7hl RPMs:"
+            ls -la rpm-repo/armv7hl/ || echo "No armv7hl RPMs"
           else
             echo "No RPM artifacts downloaded"
           fi
@@ -223,6 +248,15 @@ jobs:
             echo "No aarch64 RPMs found, skipping metadata generation"
           fi
 
+          # Generate metadata for armv7hl
+          if [ -d "armv7hl" ] && [ "$(ls -A armv7hl/*.rpm 2>/dev/null)" ]; then
+            echo "Generating metadata for armv7hl RPMs..."
+            createrepo_c armv7hl/ --update
+            echo "armv7hl metadata generated successfully"
+          else
+            echo "No armv7hl RPMs found, skipping metadata generation"
+          fi
+
       - name: Create repo file
         run: |
           cat > rpm-repo/eim.repo << EOF
diff --git a/src-tauri/Cross.toml b/src-tauri/Cross.toml
