enable ci, remove all Makefiles

Author: DemesneGH

.github/workflows/ci.yml

@@ -28,20 +28,6 @@ defaults:
     shell: bash
 
 jobs:
-  # Run test on AMD64 host
-  test-on-amd64-host:
-    uses: ./.github/workflows/reuse_test.yml
-    with:
-      runs-on: ubuntu-latest
-      container: ghcr.io/ivila/teaclave-trustzone-sdk-ci-runner:ubuntu-24.04
-
-  # Run test on ARM64 host
-  test-on-arm64-host:
-    uses: ./.github/workflows/reuse_test.yml
-    with:
-      runs-on: ubuntu-24.04-arm
-      container: ghcr.io/ivila/teaclave-trustzone-sdk-ci-runner:ubuntu-24.04
-
   # Run systest of optee_teec and build systest of optee_utee on ARM64
   systest:
     runs-on: ubuntu-24.04-arm
@@ -65,40 +51,101 @@ jobs:
           (cd optee-teec && cargo run -p systest)
           (cd optee-utee && cargo build -p systest)
 
-  # Test build no-std examples on dev docker container
-  test-nostd-build-on-dev-docker:
+  # Test cargo-optee build no-std examples - aarch64
+  test-cargo-optee-nostd-aarch64:
+    runs-on: ubuntu-latest
+    container: 
+      image: teaclave/teaclave-trustzone-emulator-nostd-expand-memory:latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Setup environment
+        run: |
+          # Run entrypoint.sh to set up the bash profile
+          /entrypoint.sh true
+          # Install jq for JSON parsing
+          apt-get update && apt-get install -y jq
+      - name: Test cargo-optee no-std build (aarch64)
+        shell: bash -l {0}  # Use login shell to load the profile
+        run: |
+          # Build using cargo-optee tool with default aarch64 settings
+          ./ci/build.sh
+
+  # Test cargo-optee build no-std examples - arm32
+  test-cargo-optee-nostd-arm32:
     runs-on: ubuntu-latest
     container: 
-      image: teaclave/teaclave-trustzone-emulator-nostd-optee-4.7.0-expand-memory:latest
+      image: teaclave/teaclave-trustzone-emulator-nostd-expand-memory:latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Setup environment
         run: |
           # Run entrypoint.sh to set up the bash profile
           /entrypoint.sh true
-      - name: Build no-std and common examples
+          # Install jq for JSON parsing
+          apt-get update && apt-get install -y jq
+      - name: Test cargo-optee no-std build (arm32)
         shell: bash -l {0}  # Use login shell to load the profile
         run: |
-          make
+          # Switch to ARM32 configuration and build
+          # Note: Explicit environment reload needed for GitHub Actions
+          # (wrapper function in .bashrc not working for non-interactive shells: docker exec cmd=[...])
+          # We can fix this by updating entrypoint.sh to make ~/.profile source ~/.bashrc
+          switch_config --ta no-std/arm32 && \
+          switch_config --host arm32 && \
+          source ${TEACLAVE_TOOLCHAIN_BASE}/environment && \
+          ./ci/build.sh --ta arm --ca arm
+
+  # Test cargo-optee build std examples - aarch64
+  test-cargo-optee-std-aarch64:
+    runs-on: ubuntu-latest
+    container:
+      image: teaclave/teaclave-trustzone-emulator-std-expand-memory:latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Setup environment
+        run: |
+          # Run entrypoint.sh to set up the bash profile
+          /entrypoint.sh true
+          # Install jq for JSON parsing
+          apt-get update && apt-get install -y jq
+      - name: Test cargo-optee std build (aarch64)
+        shell: bash -l {0}  # Use login shell to load the profile
+        run: |
+          # Link rust directory for std support
+          ln -s $RUST_STD_DIR rust
+          # Build using cargo-optee tool with default aarch64 std settings
+          ./ci/build.sh --std
 
-  # Test build std examples on dev docker container
-  test-std-build-on-dev-docker:
+  # Test cargo-optee build std examples - arm32
+  test-cargo-optee-std-arm32:
     runs-on: ubuntu-latest
     container:
-      image: teaclave/teaclave-trustzone-emulator-std-optee-4.7.0-expand-memory:latest
+      image: teaclave/teaclave-trustzone-emulator-std-expand-memory:latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Setup environment
         run: |
           # Run entrypoint.sh to set up the bash profile
           /entrypoint.sh true
-      - name: Build no-std and common examples
+          # Install jq for JSON parsing
+          apt-get update && apt-get install -y jq
+      - name: Test cargo-optee std build (arm32)
         shell: bash -l {0}  # Use login shell to load the profile
         run: |
+          # Link rust directory for std support
           ln -s $RUST_STD_DIR rust
-          make std-examples
+          # Switch to ARM32 std configuration and build
+          # Note: Explicit environment reload needed for GitHub Actions
+          # (wrapper function in .bashrc not working for non-interactive shells: docker exec cmd=[...])
+          # We can fix this by updating entrypoint.sh to make ~/.profile source ~/.bashrc
+          switch_config --ta std/arm32 && \
+          switch_config --host arm32 && \
+          source ${TEACLAVE_TOOLCHAIN_BASE}/environment && \
+          ./ci/build.sh --ta arm --ca arm --std
 
   license:
     runs-on: ubuntu-latest

Makefile

@@ -153,25 +153,60 @@ enum Command {
     Build(BuildCommand),
 }
 
+/// Source cargo environment from a given path
+fn source_cargo_env(env_path: &str) -> bool {
+    if std::path::Path::new(env_path).exists() {
+        std::process::Command::new("bash")
+            .arg("-c")
+            .arg(format!("source {}", env_path))
+            .status()
+            .map(|status| status.success())
+            .unwrap_or(false)
+    } else {
+        false
+    }
+}
+
+/// Setup cargo environment by checking availability and sourcing environment if needed
+fn setup_cargo_environment() -> anyhow::Result<()> {
+    // Check if cargo is available
+    let cargo_available = std::process::Command::new("which")
+        .arg("cargo")
+        .output()
+        .map(|output| output.status.success())
+        .unwrap_or(false);
+
+    if cargo_available {
+        return Ok(());
+    }
+
+    // Try to source .cargo/env from ~/.cargo/env or $CARGO_HOME/env
+    let mut sourced = false;
+    if let Ok(home) = env::var("HOME") {
+        sourced = source_cargo_env(&format!("{}/.cargo/env", home));
+    }
+    if !sourced {
+        if let Ok(cargo_home) = env::var("CARGO_HOME") {
+            sourced = source_cargo_env(&format!("{}/env", cargo_home));
+        }
+    }
+
+    if !sourced {
+        anyhow::bail!("cargo command not found. Please install Rust: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh");
+    }
+
+    Ok(())
+}
+
 fn main() {
     env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info"))
         .format_timestamp_millis()
         .init();
 
-    // Setup cargo environment if needed
-    if let Ok(home) = env::var("HOME") {
-        let cargo_env = format!("{}/.cargo/env", home);
-        if std::path::Path::new(&cargo_env).exists() {
-            // Add cargo bin to PATH
-            let cargo_bin = format!("{}/.cargo/bin", home);
-            if let Ok(current_path) = env::var("PATH") {
-                let new_path = format!("{}:{}", cargo_bin, current_path);
-                env::set_var("PATH", new_path);
-            }
-        } else {
-            eprintln!("Error: Cargo environment file not found at: {}. Please ensure Rust and Cargo are installed.", cargo_env);
-            process::exit(1);
-        }
+    // Setup cargo environment
+    if let Err(e) = setup_cargo_environment() {
+        eprintln!("Error: {}", e);
+        process::exit(1);
     }
 
     let cli = Cli::parse();