Merge pull request #2 from G-Research/fix-ci

Hopefully fixing github actions run

Author: tabathad

.devcontainer/devcontainer.json

@@ -52,7 +52,7 @@
 
   "forwardPorts": [8080, 9300, 3306, 6379],
 
-  "postCreateCommand": "sudo chown -R vscode:vscode /workspace && cd /workspace && python -m venv venv && ./venv/bin/pip install --upgrade pip && ./venv/bin/pip install -r requirements.txt && ./venv/bin/pip install -r .devcontainer/requirements-override.txt",
+  "postCreateCommand": "sudo chown -R vscode:vscode /workspace && cd /workspace && python -m venv venv && ./venv/bin/pip install --upgrade pip && ./venv/bin/pip install -r requirements.txt",
 
   "postStartCommand": "echo 'DevContainer ready with MariaDB and Redis running'",
 

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [ master ]
   pull_request:
-    branches: [ main ]
+    branches: [ master ]
   workflow_dispatch:
 
 jobs:
@@ -26,7 +26,6 @@ jobs:
           python -m venv venv
           ./venv/bin/pip install --upgrade pip
           ./venv/bin/pip install -r requirements.txt
-          ./venv/bin/pip install -r .devcontainer/requirements-override.txt
           ./venv/bin/pylint --rcfile ./pylint.rc pulp_manager/ || true
 
   test:
@@ -47,13 +46,12 @@ jobs:
           python -m venv venv
           ./venv/bin/pip install --upgrade pip
           ./venv/bin/pip install -r requirements.txt
-          ./venv/bin/pip install -r .devcontainer/requirements-override.txt
           ./venv/bin/pip install pytest-cov
           ./venv/bin/pytest -v --cov=pulp_manager --cov-report=xml --cov-report=term-missing --junit-xml=pytest-results.xml
 
     - name: Upload test results
       if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: test-results
         path: |
@@ -69,50 +67,3 @@ jobs:
         flags: unittests
         name: codecov-umbrella
         fail_ci_if_error: false
-
-  test-make:
-    name: Test with Make
-    runs-on: ubuntu-latest
-    
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v3
-      with:
-        submodules: recursive
-
-    - name: Run make test in devcontainer
-      uses: devcontainers/ci@v0.3
-      with:
-        runCmd: |
-          cd /workspace
-          make t
-
-  test-summary:
-    name: Test Summary
-    runs-on: ubuntu-latest
-    needs: [lint, test, test-make]
-    if: always()
-    
-    steps:
-    - name: Summary
-      run: |
-        echo "## CI Summary" >> $GITHUB_STEP_SUMMARY
-        echo "" >> $GITHUB_STEP_SUMMARY
-        
-        if [ "${{ needs.lint.result }}" == "success" ]; then
-          echo "✅ Linting passed" >> $GITHUB_STEP_SUMMARY
-        else
-          echo "❌ Linting failed" >> $GITHUB_STEP_SUMMARY
-        fi
-        
-        if [ "${{ needs.test.result }}" == "success" ]; then
-          echo "✅ Tests passed" >> $GITHUB_STEP_SUMMARY
-        else
-          echo "❌ Tests failed" >> $GITHUB_STEP_SUMMARY
-        fi
-        
-        if [ "${{ needs.test-make.result }}" == "success" ]; then
-          echo "✅ Make test passed" >> $GITHUB_STEP_SUMMARY
-        else
-          echo "❌ Make test failed" >> $GITHUB_STEP_SUMMARY
-        fi