diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..1100ba9
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,86 @@
+name: CI
+
+on:
+  push:
+    branches: [main, master, dev]
+  pull_request:
+    branches: [main, master, dev]
+
+jobs:
+  lint-and-test:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+          cache: 'pip'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements-ci.txt
+        # Uses minimal CI requirements (no tensorflow/heavy packages)
+
+      - name: Run linter (ruff)
+        run: |
+          ruff check . --select=E9,F63,F7,F82 --output-format=github \
+            --exclude="Dockerfile.*" \
+            --exclude="linktest/" \
+            --exclude="measurements/" \
+            --exclude="0mq/" \
+            --exclude="ratc/"
+        # E9: Runtime errors (syntax errors, etc.)
+        # F63: Invalid print syntax
+        # F7: Syntax errors in type comments
+        # F82: Undefined names in __all__
+        # Excludes: Dockerfiles (not Python), linktest (symlinks),
+        # measurements/0mq/ratc (config-dependent experimental scripts)
+
+      - name: Run tests (pytest)
+        run: |
+          set +e
+          pytest --tb=short -q \
+            --ignore=measurements/ \
+            --ignore=0mq/ \
+            --ignore=ratc/ \
+            --ignore=linktest/
+          status=$?
+          set -e
+          # Allow success if no tests are collected (pytest exit code 5)
+          if [ "$status" -ne 0 ] && [ "$status" -ne 5 ]; then
+            exit "$status"
+          fi
+        # Fails on real test failures, passes on no tests collected
+
+  docker-build:
+    runs-on: ubuntu-latest
+    # Only run when Dockerfile.py or related files change
+    if: |
+      github.event_name == 'push' ||
+      (github.event_name == 'pull_request' && 
+       contains(github.event.pull_request.changed_files, 'Dockerfile'))
+    
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Check if Dockerfile.py changed
+        uses: dorny/paths-filter@v3
+        id: filter
+        with:
+          filters: |
+            dockerfile:
+              - 'Dockerfile.py'
+              - 'requirements.txt'
+
+      - name: Validate Dockerfile build
+        if: steps.filter.outputs.dockerfile == 'true'
+        run: |
+          docker build -f Dockerfile.py -t concore-py-test .
+        # Validates that Dockerfile.py can be built successfully
+        # Does not push the image
diff --git a/requirements-ci.txt b/requirements-ci.txt
new file mode 100644
index 0000000..1dc06cf
--- /dev/null
+++ b/requirements-ci.txt
@@ -0,0 +1,6 @@
+# Minimal dependencies for CI (linting and testing)
+# Does not include heavyweight packages like tensorflow
+pytest
+ruff
+pyzmq
+numpy