Simplify CI to run all tests in single job

- Use --include-ignored to run both fast and slow tests in one pass
- Add 15 minute timeout to test job
- Remove duplicate integration-test job
- Add test-all and test-minio-all Makefile targets

Author: tonyalaribe

.github/workflows/ci.yml

@@ -44,60 +44,6 @@ jobs:
   test:
     name: Test
     runs-on: ubuntu-latest
-    env:
-      AWS_SDK_LOAD_CONFIG: "false"
-      AWS_ENDPOINT_URL: http://127.0.0.1:9000
-      AWS_REGION: us-east-1
-      AWS_S3_BUCKET: timefusion-test
-      AWS_S3_ENDPOINT: http://127.0.0.1:9000
-      AWS_ALLOW_HTTP: "true"
-      AWS_ACCESS_KEY_ID: minioadmin
-      AWS_SECRET_ACCESS_KEY: minioadmin
-      PGWIRE_PORT: "12345"
-      PORT: "8080"
-      TIMEFUSION_TABLE_PREFIX: timefusion-ci-test
-      BATCH_INTERVAL_MS: "1000"
-      MAX_BATCH_SIZE: "1000"
-      ENABLE_BATCH_QUEUE: "true"
-      MAX_PG_CONNECTIONS: "100"
-      AWS_S3_LOCKING_PROVIDER: ""
-      TIMEFUSION_FOYER_MEMORY_MB: "256"
-      TIMEFUSION_FOYER_DISK_GB: "10"
-      TIMEFUSION_FOYER_TTL_SECONDS: "300"
-      TIMEFUSION_FOYER_SHARDS: "8"
-    steps:
-      - name: Free disk space
-        run: sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@v2
-
-      - name: Start MinIO
-        run: |
-          docker run -d -p 9000:9000 --name minio \
-            -e MINIO_ROOT_USER=minioadmin \
-            -e MINIO_ROOT_PASSWORD=minioadmin \
-            minio/minio server /data
-          sleep 5
-          until curl -sf http://localhost:9000/minio/health/live; do sleep 1; done
-
-      - name: Install AWS CLI
-        run: |
-          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
-          unzip -q awscliv2.zip
-          sudo ./aws/install --update
-
-      - name: Create MinIO bucket
-        run: |
-          aws --endpoint-url http://127.0.0.1:9000 s3 mb s3://timefusion-test || true
-          aws --endpoint-url http://127.0.0.1:9000 s3 mb s3://timefusion-tests || true
-
-      - name: Run tests
-        run: cargo test --all-features
-
-  integration-test:
-    name: Integration Tests
-    runs-on: ubuntu-latest
     timeout-minutes: 15
     env:
       AWS_SDK_LOAD_CONFIG: "false"
@@ -110,7 +56,7 @@ jobs:
       AWS_SECRET_ACCESS_KEY: minioadmin
       PGWIRE_PORT: "12345"
       PORT: "8080"
-      TIMEFUSION_TABLE_PREFIX: timefusion-ci-integration
+      TIMEFUSION_TABLE_PREFIX: timefusion-ci-test
       BATCH_INTERVAL_MS: "1000"
       MAX_BATCH_SIZE: "1000"
       ENABLE_BATCH_QUEUE: "true"
@@ -147,5 +93,5 @@ jobs:
           aws --endpoint-url http://127.0.0.1:9000 s3 mb s3://timefusion-test || true
           aws --endpoint-url http://127.0.0.1:9000 s3 mb s3://timefusion-tests || true
 
-      - name: Run integration tests
-        run: cargo test --test integration_test --test sqllogictest -- --ignored
+      - name: Run all tests
+        run: cargo test --all-features -- --include-ignored

Cargo.toml

@@ -10,7 +10,7 @@ arrow = "57.1.0"
 arrow-json = "57.1.0"
 uuid = { version = "1.17", features = ["v4", "serde"] }
 serde = { version = "1", features = ["derive"] }
-serde_arrow = { version = "0.13.4", features = ["arrow-55"] }
+serde_arrow = { version = "0.13.7", features = ["arrow-57"] }
 serde_json = "1.0.141"
 serde_with = "3.14"
 serde_yaml = "0.9"

Makefile

@@ -1,19 +1,28 @@
-.PHONY: test test-ovh test-minio test-prod test-integration test-integration-minio run-prod build-prod minio-start minio-stop minio-clean
+.PHONY: test test-all test-ovh test-minio test-minio-all test-prod test-integration test-integration-minio run-prod build-prod minio-start minio-stop minio-clean
 
-# Default test with MinIO/test environment (uses .env)
+# Default test (fast, excludes slow integration tests)
 test:
 	cargo test $${ARGS}
 
+# Run all tests including slow integration tests
+test-all:
+	@export $$(cat .env | grep -v '^#' | xargs) && cargo test -- --include-ignored $${ARGS}
+
 # Explicit test with OVH/S3
 test-ovh:
 	@echo "Testing with OVH/S3..."
 	@export $$(cat .env | grep -v '^#' | xargs) && cargo test $${ARGS}
 
-# Test with MinIO
+# Test with MinIO (fast, excludes slow integration tests)
 test-minio:
 	@echo "Testing with MinIO..."
 	@export $$(cat .env.minio | grep -v '^#' | xargs) && cargo test $${ARGS}
 
+# Test with MinIO including all tests (same as CI)
+test-minio-all:
+	@echo "Testing all with MinIO (including integration tests)..."
+	@export $$(cat .env.minio | grep -v '^#' | xargs) && cargo test -- --include-ignored $${ARGS}
+
 # Test with production config (be careful!)
 test-prod:
 	@echo "WARNING: Testing with PRODUCTION credentials!"