Workflow update

.github/workflows/workflow.yml

@@ -10,18 +10,38 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+
 jobs:
-  build:
+  check:
+    name: Check
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.96.1
+      - uses: Swatinem/rust-cache@v2
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/icarus_models_deploy_key
+          chmod 600 ~/.ssh/icarus_models_deploy_key
+          ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/icarus_models_deploy_key
+
+          cargo check
+
+  test:
+    name: Test Suite
     runs-on: ubuntu-24.04
     services:
       postgres:
-        image: postgres:18.3-alpine
+        image: postgres:18.4-alpine
         env:
-          POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
+          POSTGRES_USER: ${{ secrets.DB_TEST_USER || 'testuser' }}
-          POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
+          POSTGRES_PASSWORD: ${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}
-          POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
+          POSTGRES_DB: ${{ secrets.DB_TEST_NAME || 'testdb' }}
-        ports:
-          - 5432:5432
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -30,55 +50,95 @@ jobs:
 
     steps:
       - uses: actions/checkout@v6
-    
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
-    - name: Install Rust
-      uses: actions-rs/toolchain@v1
         with:
           toolchain: 1.96.1
-        components: clippy, rustfmt
+      - uses: Swatinem/rust-cache@v2
-        override: true
+      - name: Verify Docker Environment
-    
-    - name: Cache dependencies
-      uses: Swatinem/rust-cache@v2
-    
-    - name: Install libpq
         run: |
-        sudo apt-get update
+          echo "Runner User Info:"
-        sudo apt-get install -y libpq-dev postgresql-client
+          id
-      
+          echo "Checking Docker Version:"
-    - name: Setup test database
+          docker --version
-      env:
+          echo "Checking Docker Daemon Status (info):"
-        DATABASE_URL: "postgres://${{ secrets.POSTGRES_USER }}:${{ secrets.POSTGRES_PASSWORD }}@localhost:5432/${{ secrets.POSTGRES_DB }}"
+          docker info
-      run: |
+          echo "Checking Docker Daemon Status (ps):"
-        # Wait for PostgreSQL to be ready
+          docker ps -a
-        for i in {1..10}; do
+          echo "Docker environment check complete."
-          pg_isready -U ${{ secrets.POSTGRES_USER }} -d ${{ secrets.POSTGRES_DB }} && break
-          sleep 2
-        done
-
-        cargo install sqlx-cli --no-default-features --features native-tls,postgres
-        sqlx migrate run --database-url $DATABASE_URL
-
-    - name: Build
-      run: |
-        mkdir -p ~/.ssh
-        echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/gitea_deploy_key
-        chmod 600 ~/.ssh/gitea_deploy_key
-        ssh-keyscan ${{ secrets.MYHOST }} >> ~/.ssh/known_hosts
-        eval $(ssh-agent -s)
-        ssh-add -v ~/.ssh/gitea_deploy_key
-        cargo build --verbose --release
-
       - name: Run tests
         env:
+          # Define DATABASE_URL for tests to use
+          DATABASE_URL: postgresql://${{ secrets.DB_TEST_USER || 'testuser' }}:${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}@postgres:5432/${{ secrets.DB_TEST_NAME || 'testdb' }}
+          RUST_LOG: info # Optional: configure test log level
+          SECRET_KEY: ${{ secrets.TOKEN_SECRET_KEY }}
+          SSH_AUTH_SOCK: ${{ env.SSH_AUTH_SOCK }}
           ROOT_DIRECTORY: "/tmp"
-        DATABASE_URL: "postgres://${{ secrets.POSTGRES_USER }}:${{ secrets.POSTGRES_PASSWORD }}@localhost:5432/${{ secrets.POSTGRES_DB }}"
         run: |
-        cat .env.sample | head -6 > .env
+          mkdir -p ~/.ssh
-        cargo test --verbose --
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/icarus_models_deploy_key
+          chmod 600 ~/.ssh/icarus_models_deploy_key
+          ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
 
-    - name: Run clippy
+          eval $(ssh-agent -s)
-      run: cargo clippy -- -D warnings
+          ssh-add -v ~/.ssh/icarus_models_deploy_key
 
-    - name: Run rustfmt
+          cargo test
-      run: cargo fmt --all -- --check
+
+  fmt:
+    name: Rustfmt
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.96.1
+      - uses: Swatinem/rust-cache@v2
+      - run: rustup component add rustfmt
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/icarus_models_deploy_key
+          chmod 600 ~/.ssh/icarus_models_deploy_key
+          ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/icarus_models_deploy_key
+          cargo fmt --all -- --check
+
+  clippy:
+    name: Clippy
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.96.1
+      - uses: Swatinem/rust-cache@v2
+      - run: rustup component add clippy
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/icarus_models_deploy_key
+          chmod 600 ~/.ssh/icarus_models_deploy_key
+          ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/icarus_models_deploy_key
+          cargo clippy -- -D warnings
+
+  build:
+    name: build
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: 1.96.1
+      - uses: Swatinem/rust-cache@v2
+      - run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/icarus_models_deploy_key
+          chmod 600 ~/.ssh/icarus_models_deploy_key
+          ssh-keyscan ${{ vars.MYHOST }} >> ~/.ssh/known_hosts
+
+          eval $(ssh-agent -s)
+          ssh-add -v ~/.ssh/icarus_models_deploy_key
+          cargo build --release