RU-T47 PR#202 Fixes

Author: ucswift

.github/workflows/react-native-cicd.yml

@@ -101,7 +101,7 @@ jobs:
           cache: 'yarn'
 
       - name: 📦 Setup yarn cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/yarn
@@ -144,7 +144,7 @@ jobs:
           token: ${{ secrets.EXPO_TOKEN }}
 
       - name: 📦 Setup yarn cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/yarn
@@ -197,7 +197,7 @@ jobs:
           fi
 
       - name: 📱 Setup EAS build cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.eas-build-local
           key: ${{ runner.os }}-eas-build-local-${{ hashFiles('**/package.json') }}
@@ -301,126 +301,7 @@ jobs:
 
       - name: 📋 Prepare Release Notes file
         if: ${{ matrix.platform == 'android' }}
-        run: |
-          set -eo pipefail
-          
-          # Function to extract release notes from PR body
-          extract_release_notes() {
-            local body="$1"
-            
-            # First pass: Remove everything between CodeRabbit comment markers using sed
-            # This handles multi-line auto-generated content
-            local cleaned_body="$(printf '%s\n' "$body" \
-              | sed '/<!-- This is an auto-generated comment: release notes by coderabbit.ai -->/,/<!-- end of auto-generated comment: release notes by coderabbit.ai -->/d')"
-            
-            # Second pass: Remove the "Summary by CodeRabbit" section
-            cleaned_body="$(printf '%s\n' "$cleaned_body" \
-              | awk '
-                BEGIN { skip=0 }
-                /^## Summary by CodeRabbit/ { skip=1; next }
-                /^## / && skip==1 { skip=0 }
-                skip==0 { print }
-              ')"
-            
-            # Third pass: Remove any remaining HTML comment lines
-            cleaned_body="$(printf '%s\n' "$cleaned_body" | sed '/^<!--.*-->$/d' | sed '/^<!--/d' | sed '/^-->$/d')"
-            
-            # Fourth pass: Remove specific CodeRabbit lines
-            cleaned_body="$(printf '%s\n' "$cleaned_body" \
-              | (grep -v '✏️ Tip: You can customize this high-level summary in your review settings\.' || true) \
-              | (grep -v '<!-- This is an auto-generated comment: release notes by coderabbit.ai -->' || true) \
-              | (grep -v '<!-- end of auto-generated comment: release notes by coderabbit.ai -->' || true))"
-            
-            # Fifth pass: Trim leading and trailing whitespace/empty lines
-            cleaned_body="$(printf '%s\n' "$cleaned_body" | sed '/^$/d' | awk 'NF {p=1} p')"
-            
-            # Try to extract content under "## Release Notes" heading if it exists
-            local notes="$(printf '%s\n' "$cleaned_body" \
-              | awk 'f && /^## /{exit} /^## Release Notes/{f=1; next} f')"
-            
-            # If no specific "Release Notes" section found, use the entire cleaned body
-            if [ -z "$notes" ]; then
-              notes="$cleaned_body"
-            fi
-            
-            # Final trim
-            notes="$(printf '%s\n' "$notes" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
-            
-            printf '%s\n' "$notes"
-          }
-          
-          # Determine source of release notes
-          NOTES=""
-          
-          # Check if this was triggered by a push event (likely a merge)
-          if [ "${{ github.event_name }}" = "push" ]; then
-            echo "Fetching PR body for merged commit..."
-            
-            # First, try to find PR number from commit message (most reliable)
-            PR_FROM_COMMIT=$(git log -1 --pretty=%B | grep -oE '#[0-9]+' | head -1 | tr -d '#' || echo "")
-            
-            if [ -n "$PR_FROM_COMMIT" ]; then
-              echo "Found PR #$PR_FROM_COMMIT from commit message"
-              PR_BODY=$(gh pr view "$PR_FROM_COMMIT" --json body --jq '.body' 2>/dev/null || echo "")
-              
-              if [ -n "$PR_BODY" ]; then
-                echo "PR body length: ${#PR_BODY}"
-                NOTES="$(extract_release_notes "$PR_BODY")"
-                echo "Extracted notes length: ${#NOTES}"
-              else
-                echo "Warning: PR body is empty"
-              fi
-            else
-              echo "No PR reference in commit message, searching by commit SHA..."
-              # Get PRs that contain this commit (using GitHub API to search by commit)
-              PR_NUMBERS=$(gh api \
-                "repos/${{ github.repository }}/commits/${{ github.sha }}/pulls" \
-                --jq '.[].number' 2>/dev/null || echo "")
-              
-              if [ -n "$PR_NUMBERS" ]; then
-                # Take the first PR found (most recently merged)
-                PR_NUMBER=$(echo "$PR_NUMBERS" | head -n 1)
-                echo "Found PR #$PR_NUMBER associated with commit"
-                
-                # Fetch the PR body
-                PR_BODY=$(gh pr view "$PR_NUMBER" --json body --jq '.body' 2>/dev/null || echo "")
-                
-                if [ -n "$PR_BODY" ]; then
-                  echo "PR body length: ${#PR_BODY}"
-                  NOTES="$(extract_release_notes "$PR_BODY")"
-                  echo "Extracted notes length: ${#NOTES}"
-                else
-                  echo "Warning: PR body is empty"
-                fi
-              else
-                echo "No associated PR found for this commit"
-              fi
-            fi
-          fi
-          
-          # Fallback to recent commits if no PR body found (skip merge commits)
-          if [ -z "$NOTES" ]; then
-            echo "No PR body found, using recent commits (excluding merge commits)..."
-            NOTES="$(git log -n 10 --pretty=format:'- %s' --no-merges | head -n 5)"
-          fi
-          
-          # Fail if no notes extracted
-          if [ -z "$NOTES" ]; then
-            echo "Error: No release notes extracted" >&2
-            exit 1
-          fi
-          
-          # Write header and notes to file
-          {
-            echo "## Version 7.${{ github.run_number }} - $(date +%Y-%m-%d)"
-            echo
-            printf '%s\n' "$NOTES"
-          } > RELEASE_NOTES.md
-          
-          echo "Release notes prepared:"
-          cat RELEASE_NOTES.md
-        env:
-          GH_TOKEN: ${{ github.token }}
+        run: ./scripts/extract-release-notes.sh "7.${{ github.run_number }}" "${{ github.event_name }}" "${{ github.repository }}" "${{ github.sha }}" "${{ github.token }}"
 
       - name: 📝 Send Release Notes to Changerawr
         if: ${{ matrix.platform == 'android' }}
@@ -483,6 +364,8 @@ jobs:
   build-web:
     needs: test
     if: (github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master')) || github.event_name == 'workflow_dispatch'
+    permissions:
+      contents: read
     runs-on: ubuntu-latest
     environment: RNBuild
     steps:
@@ -496,7 +379,7 @@ jobs:
           cache: 'yarn'
 
       - name: 📦 Setup yarn cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/yarn
@@ -607,7 +490,7 @@ jobs:
           cache: 'yarn'
 
       - name: 📦 Setup yarn cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/yarn
@@ -702,151 +585,45 @@ jobs:
             electron-dist/*.rpm
           retention-days: 7
 
+  release-electron:
+    needs: build-electron
+    if: (github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master')) || github.event_name == 'workflow_dispatch'
+    permissions:
+      contents: write  # Required for creating releases
+    runs-on: ubuntu-latest
+    environment: RNBuild
+    steps:
+      - name: 🏗 Checkout repository
+        uses: actions/checkout@v4
+
       - name: 📋 Prepare Release Notes file
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        run: |
-          set -eo pipefail
-          
-          # Function to extract release notes from PR body
-          extract_release_notes() {
-            local body="$1"
-            
-            # First pass: Remove everything between CodeRabbit comment markers using sed
-            # This handles multi-line auto-generated content
-            local cleaned_body="$(printf '%s\n' "$body" \
-              | sed '/<!-- This is an auto-generated comment: release notes by coderabbit.ai -->/,/<!-- end of auto-generated comment: release notes by coderabbit.ai -->/d')"
-            
-            # Second pass: Remove the "Summary by CodeRabbit" section
-            cleaned_body="$(printf '%s\n' "$cleaned_body" \
-              | awk '
-                BEGIN { skip=0 }
-                /^## Summary by CodeRabbit/ { skip=1; next }
-                /^## / && skip==1 { skip=0 }
-                skip==0 { print }
-              ')"
-            
-            # Third pass: Remove any remaining HTML comment lines
-            cleaned_body="$(printf '%s\n' "$cleaned_body" | sed '/^<!--.*-->$/d' | sed '/^<!--/d' | sed '/^-->$/d')"
-            
-            # Fourth pass: Remove specific CodeRabbit lines
-            cleaned_body="$(printf '%s\n' "$cleaned_body" \
-              | (grep -v '✏️ Tip: You can customize this high-level summary in your review settings\.' || true) \
-              | (grep -v '<!-- This is an auto-generated comment: release notes by coderabbit.ai -->' || true) \
-              | (grep -v '<!-- end of auto-generated comment: release notes by coderabbit.ai -->' || true))"
-            
-            # Fifth pass: Trim leading and trailing whitespace/empty lines
-            cleaned_body="$(printf '%s\n' "$cleaned_body" | sed '/^$/d' | awk 'NF {p=1} p')"
-            
-            # Try to extract content under "## Release Notes" heading if it exists
-            local notes="$(printf '%s\n' "$cleaned_body" \
-              | awk 'f && /^## /{exit} /^## Release Notes/{f=1; next} f')"
-            
-            # If no specific "Release Notes" section found, use the entire cleaned body
-            if [ -z "$notes" ]; then
-              notes="$cleaned_body"
-            fi
-            
-            # Final trim
-            notes="$(printf '%s\n' "$notes" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
-            
-            printf '%s\n' "$notes"
-          }
-          
-          # Determine source of release notes
-          NOTES=""
-          
-          # Check if this was triggered by a push event (likely a merge)
-          if [ "${{ github.event_name }}" = "push" ]; then
-            echo "Fetching PR body for merged commit..."
-            
-            # First, try to find PR number from commit message (most reliable)
-            PR_FROM_COMMIT=$(git log -1 --pretty=%B | grep -oE '#[0-9]+' | head -1 | tr -d '#' || echo "")
-            
-            if [ -n "$PR_FROM_COMMIT" ]; then
-              echo "Found PR #$PR_FROM_COMMIT from commit message"
-              PR_BODY=$(gh pr view "$PR_FROM_COMMIT" --json body --jq '.body' 2>/dev/null || echo "")
-              
-              if [ -n "$PR_BODY" ]; then
-                echo "PR body length: ${#PR_BODY}"
-                NOTES="$(extract_release_notes "$PR_BODY")"
-                echo "Extracted notes length: ${#NOTES}"
-              else
-                echo "Warning: PR body is empty"
-              fi
-            else
-              echo "No PR reference in commit message, searching by commit SHA..."
-              # Get PRs that contain this commit (using GitHub API to search by commit)
-              PR_NUMBERS=$(gh api \
-                "repos/${{ github.repository }}/commits/${{ github.sha }}/pulls" \
-                --jq '.[].number' 2>/dev/null || echo "")
-              
-              if [ -n "$PR_NUMBERS" ]; then
-                # Take the first PR found (most recently merged)
-                PR_NUMBER=$(echo "$PR_NUMBERS" | head -n 1)
-                echo "Found PR #$PR_NUMBER associated with commit"
-                
-                # Fetch the PR body
-                PR_BODY=$(gh pr view "$PR_NUMBER" --json body --jq '.body' 2>/dev/null || echo "")
-                
-                if [ -n "$PR_BODY" ]; then
-                  echo "PR body length: ${#PR_BODY}"
-                  NOTES="$(extract_release_notes "$PR_BODY")"
-                  echo "Extracted notes length: ${#NOTES}"
-                else
-                  echo "Warning: PR body is empty"
-                fi
-              else
-                echo "No associated PR found for this commit"
-              fi
-            fi
-          fi
-          
-          # Fallback to recent commits if no PR body found (skip merge commits)
-          if [ -z "$NOTES" ]; then
-            echo "No PR body found, using recent commits (excluding merge commits)..."
-            NOTES="$(git log -n 10 --pretty=format:'- %s' --no-merges | head -n 5)"
-          fi
-          
-          # Fail if no notes extracted
-          if [ -z "$NOTES" ]; then
-            echo "Error: No release notes extracted" >&2
-            exit 1
-          fi
-          
-          # Write header and notes to file
-          {
-            echo "## Version 7.${{ github.run_number }} - $(date +%Y-%m-%d)"
-            echo
-            printf '%s\n' "$NOTES"
-          } > RELEASE_NOTES.md
-          
-          echo "Release notes prepared:"
-          cat RELEASE_NOTES.md
-        env:
-          GH_TOKEN: ${{ github.token }}
+        run: ./scripts/extract-release-notes.sh "7.${{ github.run_number }}" "${{ github.event_name }}" "${{ github.repository }}" "${{ github.sha }}" "${{ github.token }}"
 
-      - name: � Download all Electron artifacts
-        if: ${{ matrix.os == 'ubuntu-latest' }}
+      - name: 📥 Download all Electron artifacts
         uses: actions/download-artifact@v4
         with:
           path: electron-artifacts/
           pattern: electron-*
           merge-multiple: false
 
       - name: 📦 Prepare Electron release artifacts
-        if: ${{ matrix.os == 'ubuntu-latest' }}
         run: |
-          # Create release-artifacts directory
-          mkdir -p release-artifacts
+          # Find all matching Electron artifacts
+          FILES=$(find electron-artifacts/ -type f \( -name "*.exe" -o -name "*.msi" -o -name "*.dmg" -o -name "*.zip" -o -name "*.AppImage" -o -name "*.deb" -o -name "*.rpm" \))
+          
+          if [ -z "$FILES" ]; then
+            echo "Error: No Electron artifacts found in electron-artifacts/ directory."
+            exit 1
+          fi
           
-          # Copy all Electron artifacts to a flat directory for release
-          find electron-artifacts/ -type f \( -name "*.exe" -o -name "*.msi" -o -name "*.dmg" -o -name "*.zip" -o -name "*.AppImage" -o -name "*.deb" -o -name "*.rpm" \) -exec cp {} release-artifacts/ \;
+          # Create release-artifacts directory and copy files
+          mkdir -p release-artifacts
+          echo "$FILES" | xargs -I {} cp {} release-artifacts/
           
           echo "Release artifacts prepared:"
           ls -lh release-artifacts/
 
       - name: 📦 Create GitHub Release with Electron builds
-        if: ${{ matrix.os == 'ubuntu-latest' }}
         uses: ncipollo/release-action@v1
         with:
           tag: '7.${{ github.run_number }}'
@@ -856,3 +633,4 @@ jobs:
           name: '7.${{ github.run_number }}'
           artifacts: 'release-artifacts/*'
           bodyFile: 'RELEASE_NOTES.md'
+

app.config.ts

@@ -107,7 +107,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
     [
       '@rnmapbox/maps',
       {
-        RNMapboxMapsVersion: '11.8.0',
+        RNMapboxMapsVersion: '11.16.2',
       },
     ],
     [

nginx.conf

@@ -38,15 +38,15 @@ http {
         # Security headers
         add_header X-Frame-Options "SAMEORIGIN" always;
         add_header X-Content-Type-Options "nosniff" always;
-        add_header X-XSS-Protection "1; mode=block" always;
+        add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:; connect-src 'self';" always;
 
         # Static assets with cache
         location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
             expires 1y;
             add_header Cache-Control "public, immutable";
             add_header X-Frame-Options "SAMEORIGIN" always;
             add_header X-Content-Type-Options "nosniff" always;
-            add_header X-XSS-Protection "1; mode=block" always;
+            add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self' data:; connect-src 'self';" always;
             try_files $uri =404;
         }
 
@@ -58,8 +58,8 @@ http {
         # Health check endpoint
         location /health {
             access_log off;
-            return 200 "healthy\n";
             add_header Content-Type text/plain;
+            return 200 "healthy\n";
         }
     }
 }