unifing build pipeline

Hahihula · Hahihula · commit afc17329b424 · 2025-02-24T13:14:58.000+01:00
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -0,0 +1,239 @@
+name: Unified Build
+
+on:
+  push:
+    tags:
+      - "v*"
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+  release:
+    types:
+      - created
+  workflow_dispatch:
+
+jobs:
+  setup-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - id: set-matrix
+        run: |
+          echo "matrix={\
+          \"include\":[\
+          {\"os\":\"ubuntu-latest\",\"package_name\":\"linux-x64\"},\
+          {\"os\":\"ubuntu-24.04-arm\",\"target\":\"aarch64-unknown-linux-gnu\",\"package_name\":\"linux-arm64\"},\
+          {\"os\":\"windows-latest\",\"package_name\":\"windows-x64\"},\
+          {\"os\":\"macos-latest\",\"package_name\":\"macos-aarch64\"},\
+          {\"os\":\"macos-13\",\"package_name\":\"macos-x64\"}\
+          ]}" >> "$GITHUB_OUTPUT"
+
+  build:
+    needs: setup-matrix
+    name: Build
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix: ${{fromJson(needs.setup-matrix.outputs.matrix)}}
+      fail-fast: false
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+          target: ${{ matrix.target }}
+
+      # Common setup steps for all platforms
+      - name: Install OpenSSL (Windows)
+        if: runner.os == 'Windows'
+        shell: powershell
+        run: |
+          echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
+          vcpkg install openssl:x64-windows-static-md
+
+      - name: Cache cargo registry
+        uses: actions/cache@v4
+        with:
+          path: ~/.cargo/registry
+          key: ${{ runner.os }}-cargo-registry
+          restore-keys: |
+            ${{ runner.os }}-cargo-registry
+
+      - name: Cache cargo index
+        uses: actions/cache@v4
+        with:
+          path: ~/.cargo/git
+          key: ${{ runner.os }}-cargo-index
+          restore-keys: |
+            ${{ runner.os }}-cargo-index
+
+      # Build & testLibrary
+      - name: Build and Test Library
+        if: runner.os != 'Windows' # issue with the openssl-sys on windows -> and it gets tested later with the binary package
+        run: |
+          cd src-tauri
+          if [ "${{ matrix.target }}" != "" ]; then
+            cargo test --no-fail-fast --no-default-features --lib --target ${{ matrix.target }} 2>&1 | tee result_lib.txt
+          else
+            cargo test --no-fail-fast --no-default-features --lib 2>&1 | tee result_lib.txt
+          fi
+        shell: bash
+        continue-on-error: true
+
+      - name: Format test results
+        if: runner.os != 'Windows'
+        uses: hahihula/rust-test-results-formatter@v1
+        with:
+          results-file: "./src-tauri/result_lib.txt"
+
+      # Build CLI
+      - name: Build CLI
+        if: runner.os != 'Windows'
+        run: |
+          cd src-tauri
+          if [ "${{ matrix.target }}" != "" ]; then
+            cargo build --release --no-default-features --features cli --target ${{ matrix.target }}
+          else
+            cargo build --release --no-default-features --features cli
+          fi
+        shell: bash
+
+      # Build CLI Windows
+      - name: Build CLI Windows
+        if: runner.os == 'Windows'
+        run: |
+          cd src-tauri
+          cargo build --release --no-default-features --features cli
+
+      # Build GUI (Tauri)
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+
+      - name: Install frontend dependencies
+        run: yarn install
+
+      # Platform specific GUI dependencies
+      - name: Install GUI dependencies (Ubuntu)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev libssl-dev patchelf
+
+      # Signing and notarization steps
+      - uses: apple-actions/import-codesign-certs@v3
+        if: startsWith(matrix.os, 'macos')
+        with:
+          p12-file-base64: ${{ secrets.MACOS_CERTIFICATE }}
+          p12-password: ${{ secrets.MACOS_CERTIFICATE_PWD }}
+          keychain: build
+
+      - name: build with signing and notarization (macos only)
+        if: startsWith(matrix.os, 'macos')
+        env:
+          MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
+          APPLE_ID: ${{ secrets.NOTARIZATION_USERNAME }}
+          APPLE_PASSWORD: ${{ secrets.NOTARIZATION_PASSWORD }}
+          APPLE_TEAM_ID: ${{ secrets.NOTARIZATION_TEAM_ID }}
+          MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
+        run: |
+          /usr/bin/security create-keychain -p espressif notary.keychain
+          /usr/bin/security default-keychain -s notary.keychain
+          /usr/bin/security unlock-keychain -p espressif notary.keychain
+          yarn tauri build
+
+
+      - name: build app
+        if: ${{ ! startsWith(matrix.os, 'macos') }}
+        run: |
+          yarn tauri build
+
+      - name: Sign Windows binaries
+        if: runner.os == 'Windows'
+        env:
+          WINDOWS_PFX_FILE: ${{ secrets.WIN_CERTIFICATE }}
+          WINDOWS_PFX_PASSWORD: ${{ secrets.WIN_CERTIFICATE_PWD }}
+          WINDOWS_SIGN_TOOL_PATH: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86\signtool.exe'
+        run: |
+          echo $env:WINDOWS_PFX_FILE | Out-File -FilePath cert.b64 -Encoding ASCII
+          certutil -decode cert.b64 cert.pfx
+          Remove-Item cert.b64
+          & "$env:WINDOWS_SIGN_TOOL_PATH" sign /f cert.pfx /p $env:WINDOWS_PFX_PASSWORD /tr http://timestamp.digicert.com /td sha256 /fd sha256 src-tauri/target/release/eim.exe
+
+      # Package and upload artifacts
+      - name: Package artifacts
+        run: |
+          mkdir -p release/{cli,gui}
+          # Copy and zip CLI artifacts
+          cp src-tauri/target/release/eim* release/cli/
+          cd release/cli && zip -r eim-cli.zip . && cd ../..
+          # Copy and zip GUI artifacts
+          cp -r src-tauri/target/release/bundle/* release/gui/
+          cd release/gui && zip -r eim-gui.zip . && cd ../..
+
+      - name: Upload artifacts CLI
+        uses: actions/upload-artifact@v4
+        with:
+          name: eim-cli-${{ matrix.package_name }}-${{ github.run_number }}
+          path: |
+            release/cli/eim-cli.zip
+
+      - name: Upload artifacts GUI
+        uses: actions/upload-artifact@v4
+        with:
+          name: eim-${{ matrix.package_name }}-${{ github.run_number }}
+          path: |
+            release/gui/eim-gui.zip
+
+      - name: Upload Release Assets
+        if: github.event_name == 'release' && github.event.action == 'created'
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: release/cli/eim-cli.zip
+          asset_name: eim-cli-${{ matrix.package_name }}-${{ github.ref_name }}.zip
+          asset_content_type: application/zip
+
+  # Tests can run in parallel after build
+  test:
+    needs: build
+    uses: ./.github/workflows/test.yml
+    with:
+      run_id: ${{ github.run_number }}
+      ref: ${{ github.event.pull_request.head.ref }}
+
+  test-cli:
+    needs: build  
+    uses: ./.github/workflows/test_cli.yml
+    with:
+      run_id: ${{ github.run_number }}
+      ref: ${{ github.event.pull_request.head.ref }}
+
+  update-release-info:
+    needs: [build, test, test-cli]
+    if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Update release information
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ap-east-1
+        run: |
+          # Update CLI release info
+          curl -s https://api.github.com/repos/espressif/idf-im-cli/releases/latest > eim_cli_release.json
+          aws s3 cp --acl=public-read "eim_cli_release.json" s3://espdldata/dl/eim/eim_cli_release.json
+          
+          # Update GUI release info
+          curl -s https://api.github.com/repos/espressif/idf-im-ui/releases/latest > eim_gui_release.json
+          aws s3 cp --acl=public-read "eim_gui_release.json" s3://espdldata/dl/eim/eim_gui_release.json 
diff --git a/.github/workflows/build_and_test_lib.yaml b/.github/workflows/build_and_test_lib.yaml
@@ -1,18 +1,18 @@
 name: Build and Test for lib
 
-on:
-  push:
-    tags:
-      - "v*"
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-  release:
-    types:
-      - created
-  workflow_dispatch:
+# on:
+#   push:
+#     tags:
+#       - "v*"
+#     branches:
+#       - master
+#   pull_request:
+#     branches:
+#       - master
+#   release:
+#     types:
+#       - created
+#   workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/build_cli.yaml b/.github/workflows/build_cli.yaml
@@ -1,18 +1,18 @@
 name: Build CLI
 
-on:
-  push:
-    tags:
-      - "v*"
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-  release:
-    types:
-      - created
-  workflow_dispatch:
+# on:
+#   push:
+#     tags:
+#       - "v*"
+#     branches:
+#       - master
+#   pull_request:
+#     branches:
+#       - master
+#   release:
+#     types:
+#       - created
+#   workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/build_tauri.yaml b/.github/workflows/build_tauri.yaml
@@ -1,18 +1,18 @@
 name: GUI Build
 
-on:
-  push:
-    tags:
-      - "v*"
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-  release:
-    types:
-      - created
-  workflow_dispatch:
+# on:
+#   push:
+#     tags:
+#       - "v*"
+#     branches:
+#       - master
+#   pull_request:
+#     branches:
+#       - master
+#   release:
+#     types:
+#       - created
+#   workflow_dispatch:
 
 # This workflow will trigger on each push to the `release` branch to create or update a GitHub release, build your app, and upload the artifacts to the release.
 
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -11,7 +11,7 @@ gui = ["dep:tauri", "dep:tauri-build", "dep:tauri-plugin-shell", "dep:tauri-plug
 cli = ["dep:clap", "dep:dialoguer", "dep:indicatif", "dep:console", "dep:log4rs", "vendored-openssl"]
 offline = []
 userustpython = ["dep:rustpython-vm", "dep:rustpython-stdlib"]
-vendored-openssl = ["openssl-sys/vendored"]  # New feature
+vendored-openssl = ["openssl-sys/vendored", "reqwest/native-tls-vendored"]
 
 [lib]
 name = "idf_im_lib"
@@ -78,4 +78,4 @@ features = []
 [target.'cfg(target_os = "windows")'.dependencies.reqwest]
 version = "0.12.4"
 default-features = false
-features = ["native-tls-vendored"]
+features = ["native-tls"]
diff --git a/tests_cli/runs/suites/basic-test.json b/tests_cli/runs/suites/basic-test.json
@@ -16,19 +16,5 @@
         "data": {
             "nonInteractive": "true"
         }
-    },
-    {
-        "id": 4,
-        "type": "custom",
-        "name": "non-interactive-full-parameters",
-        "data": {
-            "targetList": "esp32s2",
-            "idfList": "v5.3.2",
-            "installFolder": ".espcustom",
-            "idfMirror": "github",
-            "toolsMirror": "github",
-            "recursive": "false",
-            "nonInteractive": "false"
-        }
     }
 ]
