WIP

.github/actions/setup-gradle-cache/action.yml

@@ -5,10 +5,27 @@
 name: "Setup Gradle Cache"
 description: "Sets up a cache for Gradle builds"
 
+inputs:
+  accessKey:
+    required: true
+  secretKey:
+    required: true
+
 runs:
   using: "composite"
   steps:
-    - name: Set up Gradle cache
-      uses: burrunan/gradle-cache-action@v1
+    - uses: tespkg/actions-cache@v1
       with:
-        build-root-directory: frontend
+        path: |
+          frontend/.gradle
+          frontend/app/build
+          frontend/client/build
+          frontend/build
+        key: ${{ github.repository }}-${{ runner.os }}-gradle-${{ github.job }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+        restore-keys: |
+          ${{ github.repository }}-${{ runner.os }}-gradle-
+        bucket: actions-cache
+        accessKey: ${{ inputs.accessKey }}
+        secretKey: ${{ inputs.secretKey }}
+        endpoint: nbg1.your-objectstorage.com
+        use-fallback: false

.github/actions/setup-rust-cache/action.yml

@@ -5,10 +5,26 @@
 name: "Setup Rust"
 description: "Sets up a rust action"
 
+inputs:
+  accessKey:
+    required: true
+  secretKey:
+    required: true
+  cacheKey:
+    required: false
+
 runs:
   using: "composite"
   steps:
-    - name: Set up Rust cache
-      uses: Swatinem/rust-cache@v2
+    - uses: tespkg/actions-cache@v1
       with:
-        workspaces: "rust -> rust/target"
+        path: |
+          rust/target
+        key: ${{ github.repository }}-${{ runner.os }}-cargo-${{ github.job }}-${{ inputs.cacheKey }}-${{ hashFiles('**/Cargo.lock') }}
+        restore-keys: |
+          ${{ github.repository }}-${{ runner.os }}-cargo-${{ github.job }}-${{ inputs.cacheKey }}-
+        bucket: actions-cache
+        accessKey: ${{ inputs.accessKey }}
+        secretKey: ${{ inputs.secretKey }}
+        endpoint: nbg1.your-objectstorage.com
+        use-fallback: false

.github/workflows/pull_request.yml

@@ -0,0 +1,113 @@
+# SPDX-FileCopyrightText: 2024 Felix Hilgers <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+
+name: PR
+
+on:
+  workflow_dispatch:
+  pull_request:
+    branches: [main, dev]
+
+env:
+  RUSTFLAGS: "-Dwarnings"
+  CARGO_INCREMENTAL: 0
+
+jobs:
+
+  reuse-lint:
+    name: Reuse Lint
+    runs-on: self-hosted
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Reuse Lint
+        run: nix develop --command reuse lint
+
+  sbom:
+    name: Generate Sbom
+    runs-on: self-hosted
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Generate Sbom
+        run: nix develop --command python utils/generate_sbom.py
+
+  rust-lint:
+    name: Rust Lint
+    runs-on: self-hosted
+    needs: [reuse-lint]
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/setup-rust-cache
+        with:
+          accessKey: ${{ secrets.CACHE_ACCESS_KEY }}
+          secretKey: ${{ secrets.CACHE_SECRET_KEY }}
+
+      - name: Cargo Clippy
+        run: | 
+          cd rust
+          nix develop --command cargo clippy --all-targets --all-features
+  
+  rust-test:
+    name: Rust Tests
+    runs-on: self-hosted
+    needs: [rust-lint]
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/setup-rust-cache
+        with:
+          accessKey: ${{ secrets.CACHE_ACCESS_KEY }}
+          secretKey: ${{ secrets.CACHE_SECRET_KEY }}
+
+      - name: Cargo test
+        run: | 
+          cd rust
+          nix develop --command cargo test --all-targets --all-features
+
+  rust-build:
+    name: Rust Build
+    runs-on: self-hosted
+    needs: [rust-test]
+    strategy:
+      matrix:
+        target: [arm64-v8a, x86_64]
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/setup-rust-cache
+        with:
+          accessKey: ${{ secrets.CACHE_ACCESS_KEY }}
+          secretKey: ${{ secrets.CACHE_SECRET_KEY }}
+          cacheKey: ${{ matrix.target }}
+
+      - name: Cargo Build Daemon ${{ matrix.target }}
+        run: | 
+          cd rust
+          nix develop --command cargo ndk --target ${{ matrix.target }} build --package example
+
+
+  gradle-build:
+    name: Gradle Build
+    runs-on: self-hosted
+    needs: [reuse-lint]
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/setup-rust-cache
+        with:
+          accessKey: ${{ secrets.CACHE_ACCESS_KEY }}
+          secretKey: ${{ secrets.CACHE_SECRET_KEY }}      
+      - uses: ./.github/actions/setup-gradle-cache
+        with:
+          accessKey: ${{ secrets.CACHE_ACCESS_KEY }}
+          secretKey: ${{ secrets.CACHE_SECRET_KEY }}
+
+      - name: Gradle Lint
+        run: | 
+          cd frontend
+          nix develop --command ./gradlew build --no-daemon --parallel

flake.nix

@@ -171,6 +171,7 @@
 
           toolsDevShell = pkgs.mkShell {
             packages = packageGroups.combined;
+            ANDROID_NDK_TOOLCHAIN_DIR = "${(pkgs.androidSdk (_: packageGroups.sdkPkgs))}/share/android-sdk/ndk";
           };
 
           generateSbom =
@@ -185,7 +186,7 @@
             '';
 
           rustCiPreamble = ''
-            export PATH=${pkgs.lib.makeBinPath (with pkgs; [ protobuf clang cargo-ndk bpf-linker ] ++ packageGroups.rustPkgs)}:$PATH
+            export PATH=${pkgs.lib.makeBinPath (with pkgs; [ protobuf clang cargo-ndk bpf-linker python3 ] ++ packageGroups.rustPkgs)}:$PATH
             set -euo pipefail
           '';
           frontendCiPreamble =

frontend/app/build.gradle.kts

@@ -87,6 +87,7 @@ dependencies {
     debugImplementation(libs.androidx.ui.test.manifest)
 
     implementation(project(":client"))
+    testRuntimeOnly(project(":client", configuration = "testArtifacts"))
 
     compileOnly(libs.koin.core)
     implementation(libs.koin.android)

frontend/app/src/test/java/de/amosproj3/ziofa/ZIOFAApplicationTest.kt

@@ -4,6 +4,10 @@
 
 package de.amosproj3.ziofa
 
+import de.amosproj3.ziofa.client.RustClientFactory
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
 import org.junit.Test
 import org.koin.core.annotation.KoinExperimentalAPI
 import org.koin.test.KoinTest
@@ -12,7 +16,9 @@ import org.koin.test.verify.verify
 class ZIOFAApplicationTest : KoinTest {
     @OptIn(KoinExperimentalAPI::class)
     @Test
-    fun checkModules() {
+    fun checkModules(): Unit = runBlocking {
         ZIOFAApplication().appModule.verify()
+
+        RustClientFactory().connect(CoroutineScope(Dispatchers.IO), url = "https://google.com")
     }
 }