Merge pull request #6 from openSVM/ci-setup-opensvm-dioxus-7409

Setup CI for opensvm-dioxus

Author: larp0

.github/workflows/ci.yml

@@ -1,4 +1,3 @@
----
 name: CI/CD Pipeline
 
 on:
@@ -19,9 +18,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-22.04, macos-latest, windows-latest]
         include:
-          - os: ubuntu-latest
+          - os: ubuntu-22.04
             target: wasm32-unknown-unknown
             platform: web
           - os: macos-latest
@@ -36,12 +35,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
-          toolchain: stable
-          override: true
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
 
       - name: Cache dependencies
         uses: actions/cache@v4
@@ -53,76 +49,66 @@ jobs:
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: ${{ runner.os }}-cargo-
 
-      - name: Install Dioxus CLI
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: dioxus-cli --force
+      - name: Add WASM target
+        if: ${{ matrix.platform == 'web' }}
+        run: rustup target add wasm32-unknown-unknown
 
       - name: Install Linux dependencies
-        if: matrix.os == 'ubuntu-latest'
+        if: ${{ matrix.os == 'ubuntu-22.04' }}
         run: |
           sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
+          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev patchelf pkg-config libssl-dev libsoup-3.0-dev
 
       - name: Install wasm-bindgen-cli
-        if: matrix.platform == 'web'
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: wasm-bindgen-cli
+        if: ${{ matrix.platform == 'web' }}
+        run: cargo install wasm-bindgen-cli
 
-      - name: Install wasm-opt
-        if: matrix.platform == 'web'
+      - name: Build for Web
+        if: ${{ matrix.platform == 'web' }}
         run: |
-          if [ "$RUNNER_OS" == "Linux" ]; then
-            curl -L https://github.com/WebAssembly/binaryen/releases/download/version_111/binaryen-version_111-x86_64-linux.tar.gz | tar xz
-            sudo cp binaryen-version_111/bin/wasm-opt /usr/local/bin/
-          elif [ "$RUNNER_OS" == "macOS" ]; then
-            brew install binaryen
-          else
-            choco install binaryen
-          fi
-        shell: bash
+          cd opensvm-dioxus
+          cargo build --target wasm32-unknown-unknown --features web --release --no-default-features
 
-      - name: Build for Web
-        if: matrix.platform == 'web'
+      - name: Build for Desktop (macOS)
+        if: ${{ matrix.platform == 'desktop' && matrix.os == 'macos-latest' }}
         run: |
           cd opensvm-dioxus
-          dioxus build --features web --profile wasm-release --platform web --release
+          RUSTFLAGS="-C target-cpu=native" cargo build --features desktop --release --no-default-features
+        shell: bash
 
-      - name: Build for Desktop (macOS/Linux)
-        if: matrix.platform == 'desktop' && matrix.os != 'windows-latest'
+      - name: Build for Desktop (Linux)
+        if: ${{ matrix.platform == 'desktop' && matrix.os == 'ubuntu-22.04' }}
         run: |
           cd opensvm-dioxus
-          RUSTFLAGS="-C target-cpu=native" dioxus build --features desktop --profile desktop-release --platform desktop --release
+          RUSTFLAGS="-C target-cpu=native" cargo build --features desktop --release --no-default-features
         shell: bash
 
       - name: Build for Desktop (Windows)
-        if: matrix.platform == 'desktop' && matrix.os == 'windows-latest'
+        if: ${{ matrix.platform == 'desktop' && matrix.os == 'windows-latest' }}
         run: |
           cd opensvm-dioxus
           $env:RUSTFLAGS="-C target-cpu=native"
-          dioxus build --features desktop --profile desktop-release --platform desktop --release
+          cargo build --features desktop --release --no-default-features
         shell: pwsh
 
       - name: Run tests
         run: |
           cd opensvm-dioxus
-          cargo test --all-features
+          cargo test --features ${{ matrix.platform }} --no-default-features
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: opensvm-dioxus-${{ matrix.os }}-${{ matrix.platform }}
           path: |
-            opensvm-dioxus/dist/
+            opensvm-dioxus/target/*/release/opensvm-dioxus*
+            opensvm-dioxus/target/release/opensvm-dioxus*
 
   release:
     name: Create Release
     needs: build-and-test
     if: startsWith(github.ref, 'refs/tags/v')
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -137,24 +123,31 @@ jobs:
           mkdir -p release-assets
 
           # Web (WASM)
-          if [ -d "artifacts/opensvm-dioxus-ubuntu-latest-web/web" ]; then
-            cd artifacts/opensvm-dioxus-ubuntu-latest-web/web
-            zip -r ../../../release-assets/opensvm-dioxus-web.zip .
-            cd ../../..
+          if [ -d "artifacts/opensvm-dioxus-ubuntu-22.04-web" ]; then
+            cd artifacts/opensvm-dioxus-ubuntu-22.04-web
+            zip -r ../release-assets/opensvm-dioxus-web.zip .
+            cd ..
           fi
 
           # macOS
-          if [ -d "artifacts/opensvm-dioxus-macos-latest-desktop/desktop" ]; then
-            cd artifacts/opensvm-dioxus-macos-latest-desktop/desktop
-            zip -r ../../../release-assets/opensvm-dioxus-macos.zip .
-            cd ../../..
+          if [ -d "artifacts/opensvm-dioxus-macos-latest-desktop" ]; then
+            cd artifacts/opensvm-dioxus-macos-latest-desktop
+            zip -r ../release-assets/opensvm-dioxus-macos.zip .
+            cd ..
           fi
 
           # Windows
-          if [ -d "artifacts/opensvm-dioxus-windows-latest-desktop/desktop" ]; then
-            cd artifacts/opensvm-dioxus-windows-latest-desktop/desktop
-            zip -r ../../../release-assets/opensvm-dioxus-windows.zip .
-            cd ../../..
+          if [ -d "artifacts/opensvm-dioxus-windows-latest-desktop" ]; then
+            cd artifacts/opensvm-dioxus-windows-latest-desktop
+            zip -r ../release-assets/opensvm-dioxus-windows.zip .
+            cd ..
+          fi
+
+          # Android
+          if [ -d "artifacts/opensvm-dioxus-android" ]; then
+            cd artifacts/opensvm-dioxus-android
+            zip -r ../release-assets/opensvm-dioxus-android.zip .
+            cd ..
           fi
         shell: bash
 
@@ -194,8 +187,11 @@ jobs:
           VERSION=${GITHUB_REF#refs/tags/v}
           DOWNLOAD_URL="https://github.com/${{ github.repository }}/releases/download/v${VERSION}/opensvm-dioxus-macos.zip"
 
-          # Calculate SHA256
-          curl -L -o opensvm-dioxus-macos.zip "$DOWNLOAD_URL"
+          # Wait for release to be available
+          sleep 30
+
+          # Calculate SHA256 of the released asset
+          curl -L -o opensvm-dioxus-macos.zip "$DOWNLOAD_URL" || exit 1
           SHA256=$(shasum -a 256 opensvm-dioxus-macos.zip | awk '{print $1}')
 
           # Create formula directory if it doesn't exist
@@ -217,49 +213,40 @@ jobs:
           end
           EOF
 
-          # Create a new branch
+          # Create a new branch for the formula update
           git checkout -b update-homebrew-formula-v$VERSION
 
           # Commit and push changes
           git add Formula/opensvm-dioxus.rb
           git commit -m "Update Homebrew formula to v$VERSION"
           git push origin update-homebrew-formula-v$VERSION
 
-          # Create pull request
+          # Create pull request using GitHub CLI
           gh pr create --title "Update Homebrew formula to v$VERSION" --body "Updates the Homebrew formula for opensvm-dioxus to version $VERSION" --base main --head update-homebrew-formula-v$VERSION
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   android-build:
     name: Build Android
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: github.event_name == 'push'
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set up JDK
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'
 
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
-          toolchain: stable
-          override: true
-          target: aarch64-linux-android
+          targets: aarch64-linux-android
 
       - name: Install Android SDK
-        uses: android-actions/setup-android@v2
-
-      - name: Install Dioxus CLI
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: dioxus-cli --force
+        uses: android-actions/setup-android@v3
 
       - name: Cache dependencies
         uses: actions/cache@v4
@@ -274,24 +261,10 @@ jobs:
       - name: Build for Android
         run: |
           cd opensvm-dioxus
-          RUSTFLAGS="-C opt-level=3 -C lto=thin" dioxus build --features android --platform android --release
-
-      - name: Optimize APK
-        run: |
-          cd opensvm-dioxus/dist/android
-          $ANDROID_HOME/build-tools/33.0.0/zipalign -v -p 4 app-release-unsigned.apk app-release-aligned.apk
-          $ANDROID_HOME/build-tools/33.0.0/apksigner sign --ks debug.keystore --ks-pass pass:android --key-pass pass:android --out opensvm-dioxus.apk app-release-aligned.apk
+          RUSTFLAGS="-C opt-level=3 -C lto=thin" cargo build --target aarch64-linux-android --features android --release --no-default-features
 
       - name: Upload Android artifact
         uses: actions/upload-artifact@v4
         with:
           name: opensvm-dioxus-android
-          path: opensvm-dioxus/dist/android/opensvm-dioxus.apk
-
-      - name: Add Android APK to release
-        if: startsWith(github.ref, 'refs/tags/v')
-        uses: softprops/action-gh-release@v1
-        with:
-          files: opensvm-dioxus/dist/android/opensvm-dioxus.apk
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          path: opensvm-dioxus/target/aarch64-linux-android/release/opensvm-dioxus