Merge branch 'master' of github.com:newpanjing/simpleui

Author: newpanjing

.github/workflows/Dockerfile

@@ -0,0 +1,39 @@
+# Use official Python image with correct version
+FROM python:3.11.8-slim
+
+# Install system dependencies: PostgreSQL client and Redis
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+         gcc \
+         libpq-dev \
+         redis-server \
+    && rm -rf /var/lib/apt/lists/*
+
+# Set work directory
+WORKDIR /app/api/tacticalrmm
+
+# Copy requirements files first (for efficient build caching)
+COPY api/tacticalrmm/requirements*.txt ./
+COPY api/tacticalrmm/settings.py ./
+
+# Extract/set setuptools and wheel versions dynamically (optional: set defaults here if needed)
+ARG SETUPTOOLS_VER=latest
+ARG WHEEL_VER=latest
+
+# Install pip, setuptools, wheel (use values from settings.py if automated, or set fixed versions below)
+RUN pip install --upgrade pip==25.1 \
+  && pip install setuptools==$SETUPTOOLS_VER wheel==$WHEEL_VER \
+  && pip install -r requirements.txt -r requirements-test.txt
+
+# Copy rest of the source code
+COPY . /app
+
+# Start Redis server in background (for local/dev use)
+RUN service redis-server start
+
+# Expose port if running server
+EXPOSE 8000
+
+# Default CMD (customize for your app)
+CMD ["pytest"]
+# Or, if you want to run Django by default: ["python", "manage.py", "runserver", "0.0.0.0:8000"]

.github/workflows/cicd.yaml

@@ -0,0 +1,84 @@
+name: Tests CI
+
+on:
+  push:
+    branches:
+      - develop
+      - "main"
+  pull_request:
+    branches:
+      - develop
+      - "main"
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    name: Tests
+    strategy:
+      matrix:
+        python-version: ["3.11.8"]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: harmon758/postgresql-action@v1
+        with:
+          postgresql version: "15"
+          postgresql db: "pipeline"
+          postgresql user: "pipeline"
+          postgresql password: "pipeline123456"
+
+      - name: Setup Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          check-latest: true
+
+      - name: Install redis
+        run: |
+          sudo apt update
+          sudo apt install -y redis
+          redis-server --version
+
+      - name: Install requirements
+        working-directory: api/tacticalrmm
+        run: |
+          python --version
+          SETTINGS_FILE="tacticalrmm/settings.py"
+          SETUPTOOLS_VER=$(grep "^SETUPTOOLS_VER" "$SETTINGS_FILE" | awk -F'[= "]' '{print $5}')
+          WHEEL_VER=$(grep "^WHEEL_VER" "$SETTINGS_FILE" | awk -F'[= "]' '{print $5}')
+          pip install pip==25.1
+          pip install setuptools==${SETUPTOOLS_VER} wheel==${WHEEL_VER}
+          pip install -r requirements.txt -r requirements-test.txt
+
+      - name: Codestyle black
+        working-directory: api
+        run: |
+          black --exclude migrations/ --check --diff tacticalrmm
+          if [ $? -ne 0 ]; then
+              exit 1
+          fi
+
+      - name: Lint with flake8
+        working-directory: api/tacticalrmm
+        run: |
+          flake8 --config .flake8 .
+          if [ $? -ne 0 ]; then
+              exit 1
+          fi
+
+      - name: Run django tests
+        env:
+          GHACTIONS: "yes"
+        working-directory: api/tacticalrmm
+        run: |
+          pytest
+          if [ $? -ne 0 ]; then
+              exit 1
+          fi
+
+      - uses: codecov/codecov-action@v3
+        with:
+          directory: ./api/tacticalrmm
+          files: ./api/tacticalrmm/coverage.xml
+          verbose: true

.github/workflows/my-new-cicd.yaml

@@ -0,0 +1,42 @@
+name: CI Pipeline
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+
+      - name: Run tests
+        run: |
+          python -m pytest tests/
+
+      - name: Build package
+        run: |
+          python setup.py sdist bdist_wheel
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: package
+          path: dist/
+      - name: Lint code
+        run: |
+          pip install flake8
+          flake8 .

.github/workflows/python-package.yml

@@ -5,9 +5,9 @@ name: Python package
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   build: