Cleanup things

Author: glanzel

.github/ci_base/Dockerfile

@@ -24,10 +24,6 @@ RUN apt update && \
         libmagic-dev && \
     rm -rf /var/lib/apt/lists/*
 
-# Install Bun
-RUN curl -fsSL https://bun.sh/install | bash
-ENV PATH="/root/.bun/bin:$PATH"
-
 # Install uv system-wide
 RUN curl -LsSf https://astral.sh/uv/install.sh | sh && \
     cp /root/.local/bin/uv /usr/local/bin/uv

.github/workflows/django.yml

@@ -1,9 +1,6 @@
 name: Django CI
 
 on:
-  workflow_run:
-    workflows: ["Build and Push CI Base Image"]
-    types: [completed]
   push:
     branches: [ main ]
   pull_request:
@@ -20,25 +17,12 @@ jobs:
         run: |
           sudo service postgresql start
       
-      - name: Test Postgres
-        env:
-          PGPASSWORD: postgres
-          PGHOSTADDR: 127.0.0.1
-
-        run: |
-          # Test postgres user
-          psql -h localhost -U postgres -d django -c "SELECT version();"
-          psql -h localhost -U postgres -d django_test -c "SELECT 1;"
-          # Test PostGIS extension
-          psql -h localhost -U postgres -d django -c "SELECT PostGIS_version();"
-          psql -h localhost -U postgres -d django_test -c "SELECT PostGIS_version();"
-
-
       - name: Set up Python ${{ matrix.python-version }}
         id: setup-python
         uses: actions/setup-python@v5
         with:
           python-version: '3.12'
+
       - name: Cache node packages
         uses: actions/cache@v4
         env:
@@ -50,18 +34,19 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
             ${{ runner.os }}-
-      - name: Cache node_modules
+      - name: ""
         id: cache-node-modules
         uses: actions/cache@v4
         with:
           path: node_modules
           key: ${{ runner.os }}-node_modules-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-node_modules-
-      - name: Show node_modules cache status
+      - name: ""
         run: |
           echo "node_modules cache hit: ${{ steps.cache-node-modules.outputs.cache-hit }}"
           ls -la node_modules 2>/dev/null || echo "node_modules directory does not exist"
+
       - name: Cache uv packages
         uses: actions/cache@v4
         env:
@@ -73,6 +58,7 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
             ${{ runner.os }}-
+
       - name: Cache testmon data
         id: cache-testmon
         uses: actions/cache@v4
@@ -81,11 +67,10 @@ jobs:
           key: ${{ runner.os }}-testmon-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/requirements/dev.txt', 'adhocracy-plus/config/settings/*.py', 'pytest.ini') }}
           restore-keys: |
             ${{ runner.os }}-testmon-${{ steps.setup-python.outputs.python-version }}-
-
-      - name: Show testmon cache status
-        run: |
+      - run: |
           echo "testmon cache hit: ${{ steps.cache-testmon.outputs.cache-hit }}"
           ls -la .testmondata || true
+
       - name: check a4 hashes equal
         run: |
           ./scripts/a4-check.sh
@@ -102,22 +87,28 @@ jobs:
         run: |
           python manage.py collectstatic > /dev/null
           # Einmalig Cache löschen, um Settings-Mismatch auszuschließen
-          py.test --ds=adhocracy-plus.config.settings.travis --testmon --cov
           isort --diff -c adhocracy-plus tests
           python manage.py makemigrations --dry-run --check --noinput
           flake8 adhocracy-plus tests --exclude migrations,settings
-      
-      - name: Configure Git for Coveralls
+
+      - name: ""
+        if: github.ref == 'refs/heads/main' && github.event_name == 'push'
         run: |
-          git config --global --add safe.directory /__w/adhocracy-plus/adhocracy-plus
-          git config --global user.name "GitHub Actions"
-          git config --global user.email "[email protected]"
-      
+          py.test --ds=adhocracy-plus.config.settings.travis --cov
+
+      - name: ""
+        if: github.event_name == 'pull_request'
+        run: |
+          py.test --ds=adhocracy-plus.config.settings.travis --testmon --cov
+
       - name: Coveralls
-        env:
+      - env:
           COVERALLS_SERVICE_NAME: github-actions
           GITHUB_TOKEN: ${{ secrets.COV }}
         run: |
+          git config --global --add safe.directory /__w/adhocracy-plus/adhocracy-plus
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "[email protected]"
           coveralls
 
       - name: Install NPM Dependencies
@@ -137,6 +128,7 @@ jobs:
         run: |
           npm test
           npm run lint
+
       - name: Deploy
         if: github.ref == 'refs/heads/main'
         env: