Merge branch 'fix/gitlab-ci' into 'develop'

Fix/gitlab ci

See merge request genaiic-reusable-assets/engagement-artifacts/genaiic-idp-accelerator!393

Author: rstrahan

.github/workflows/developer-tests.yml

@@ -6,66 +6,66 @@ name: Developer Tests
 on:
   pull_request:
     branches:
-      - '**'  # Run on PR open, update, or synchronize (i.e., any push to PR branch)
+      - "**" # Run on PR open, update, or synchronize (i.e., any push to PR branch)
 
 # Global timeout for all jobs
 # Note: GitHub Actions uses minutes, GitLab uses duration strings
 jobs:
   developer_tests:
     name: Lint, Type Check, and Test
     runs-on: ubuntu-latest
-    timeout-minutes: 120  # 2 hours
-    
+    timeout-minutes: 120 # 2 hours
+
     # Use Python 3.13 to match GitLab configuration
     container:
       image: python:3.13-bookworm
-    
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0  # Fetch all history for git diff in typecheck-pr
-      
+          fetch-depth: 0 # Fetch all history for git diff in typecheck-pr
+
       - name: Set up Git safe directory
         run: |
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
-      
+
       - name: Fetch base branch
         run: |
           git fetch origin ${{ github.base_ref || 'main' }}:refs/remotes/origin/${{ github.base_ref || 'main' }}
           git branch -a
-      
+
       - name: Set up environment
         run: |
           python --version
           apt-get update -y
           apt-get install make curl -y
-      
+
       - name: Install uv
         run: |
           curl -LsSf https://astral.sh/uv/install.sh | sh
           echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-      
+
       - name: Create virtual environment
         run: |
           uv venv .venv
           echo "$GITHUB_WORKSPACE/.venv/bin" >> $GITHUB_PATH
-      
+
       - name: Install Node.js and basedpyright
         run: |
           curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
           apt-get install -y nodejs
           npm install -g basedpyright
-      
+
       - name: Install Python dependencies
         run: |
           uv pip install ruff
           uv pip install typer rich boto3
           cd lib/idp_common_pkg && uv pip install -e ".[test]" && cd ../..
-      
+
       - name: Run linting checks
         run: make lint-cicd
-      
+
       - name: Run type checking
         run: |
           TARGET_BRANCH="${{ github.base_ref }}"
@@ -74,14 +74,14 @@ jobs:
           echo "Comparing: origin/$TARGET_BRANCH...HEAD"
           echo "===================================="
           echo ""
-          
-          python3 scripts/typecheck_pr_changes.py "$TARGET_BRANCH"
-      
+
+          make typecheck-pr TARGET_BRANCH="$TARGET_BRANCH"
+
       - name: Run tests
         id: run-tests
         run: make test-cicd -C lib/idp_common_pkg
         continue-on-error: false
-      
+
       - name: Upload coverage reports
         uses: actions/upload-artifact@v4
         if: always() && steps.run-tests.outcome != 'skipped'
@@ -91,14 +91,14 @@ jobs:
             lib/idp_common_pkg/test-reports/coverage.xml
             lib/idp_common_pkg/test-reports/test-results.xml
           retention-days: 7
-      
+
       - name: Publish test results
         uses: EnricoMi/publish-unit-test-result-action@v2
         if: always() && hashFiles('lib/idp_common_pkg/test-reports/test-results.xml') != ''
         with:
           files: lib/idp_common_pkg/test-reports/test-results.xml
           check_name: Test Results
-      
+
       - name: Code Coverage Report
         uses: irongut/CodeCoverageSummary@v1.3.0
         if: always() && hashFiles('lib/idp_common_pkg/test-reports/coverage.xml') != ''
@@ -111,8 +111,8 @@ jobs:
           hide_complexity: true
           indicators: true
           output: both
-          thresholds: '60 80'
-      
+          thresholds: "60 80"
+
       # Note: PR comments disabled for fork PRs due to permission restrictions
       # Coverage results are available in:
       # 1. Workflow artifacts (test-reports)

.gitlab-ci.yml

@@ -26,14 +26,17 @@ stages:
 developer_tests:
   stage: developer_tests
   rules:
-    - when: always # Run on all branches
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      when: always # Only run on merge requests (PRs), not on merged branches
 
   before_script:
     - python --version
     - apt-get update -y
     - apt-get install make curl git -y
-    # Fetch main branch for comparison in typecheck-pr
-    - git fetch origin main:main || echo "Could not fetch main branch"
+    # Fetch target branch for comparison in typecheck-pr
+    - export TARGET_BRANCH="${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-main}"
+    - echo "MR target branch (CI_MERGE_REQUEST_TARGET_BRANCH_NAME):$TARGET_BRANCH"
+    - git fetch origin $TARGET_BRANCH:$TARGET_BRANCH || echo "Could not fetch $TARGET_BRANCH branch"
     # Install uv
     - pip install uv
     # Create virtual environment
@@ -51,7 +54,12 @@ developer_tests:
 
   script:
     - make lint-cicd
-    - make typecheck-cicd
+    - echo "=== Type Checking Configuration ==="
+    - echo "MR target branch:$TARGET_BRANCH"
+    - echo "Comparing:$TARGET_BRANCH...HEAD"
+    - echo "===================================="
+    - echo ""
+    - make typecheck-pr TARGET_BRANCH=$TARGET_BRANCH
     - make test-cicd -C lib/idp_common_pkg
 
   artifacts:
@@ -128,4 +136,3 @@ integration_tests:
 
     # Run integration test deployment
     - python3 scripts/integration_test_deployment.py
-

Makefile

@@ -89,17 +89,7 @@ typecheck-pr:
 	@echo "Type checking changed files against $(TARGET_BRANCH)..."
 	python3 scripts/typecheck_pr_changes.py $(TARGET_BRANCH)
 
-# CI/CD version of type check - checks PR changes only
-typecheck-cicd:
-	@echo "Running type quality checks on PR changes..."
-	@if ! python3 scripts/typecheck_pr_changes.py $(TARGET_BRANCH); then \
-		echo -e "$(RED)ERROR: Type checking failed!$(NC)"; \
-		echo -e "$(YELLOW)Please run 'make typecheck-pr' locally to fix these issues.$(NC)"; \
-		exit 1; \
-	fi
-	@echo -e "$(GREEN)All type checks passed!$(NC)"
 
-# A convenience Makefile target that runs 
 commit: lint test
 	$(info Generating commit message...)
 	export COMMIT_MESSAGE="$(shell q chat --no-interactive --trust-all-tools "Understand pending local git change and changes to be committed, then infer a commit message. Return this commit message only" | tail -n 1 | sed 's/\x1b\[[0-9;]*m//g')" && \