CU-868cu9311 working on github actions and minor fix.

ucswift · ucswift · commit 86f895e5f886 · 2025-06-08T12:52:39.000-07:00
diff --git a/.expo/devices.json b/.expo/devices.json
@@ -1,8 +1,32 @@
 {
   "devices": [
+    {
+      "installationId": "4af035d0-07a6-423e-b6bc-17e75e219cfe",
+      "lastUsed": 1749391119998
+    },
+    {
+      "installationId": "aa1e01fe-0cc5-418d-93e4-df49f96c1e43",
+      "lastUsed": 1749388195311
+    },
+    {
+      "installationId": "2964cc85-ebf5-4eb5-8de9-b46a30fa64bc",
+      "lastUsed": 1749385761171
+    },
+    {
+      "installationId": "6142ad22-0704-42f4-9826-1999a4b19d0a",
+      "lastUsed": 1749385369955
+    },
+    {
+      "installationId": "ccb3c274-d545-46a7-8b80-3d3d181c8464",
+      "lastUsed": 1749302782562
+    },
+    {
+      "installationId": "b63e4dc1-263c-47f2-afe6-99e9c06d5b90",
+      "lastUsed": 1749265905063
+    },
     {
       "installationId": "ef2f0ec1-1637-48ae-a465-b6044dbaf625",
-      "lastUsed": 1749254257540
+      "lastUsed": 1749262351089
     },
     {
       "installationId": "121adcd6-201e-4de8-adbe-deceab35ee92",
@@ -15,14 +39,6 @@
     {
       "installationId": "a66b5af2-bed7-4b5d-aff0-94e99e751b90",
       "lastUsed": 1749220817812
-    },
-    {
-      "installationId": "156ab25a-f4f1-4407-a003-39cc7af21924",
-      "lastUsed": 1746944077967
-    },
-    {
-      "installationId": "97dd0ee0-1583-4737-a03e-2f9940824d23",
-      "lastUsed": 1746889728991
     }
   ]
 }
diff --git a/.github/workflows/react-native-cicd.yml b/.github/workflows/react-native-cicd.yml
@@ -0,0 +1,245 @@
+name: React Native CI/CD
+
+on:
+  push:
+    branches: [main, master]
+    paths-ignore:
+      - "**.md"
+      - "LICENSE"
+      - "docs/**"
+  pull_request:
+    branches: [main, master]
+  workflow_dispatch:
+    inputs:
+      buildType:
+        type: choice
+        description: "Build type to run"
+        options:
+          - dev
+          - prod-apk
+          - prod-aab
+          - ios-dev
+          - ios-prod
+          - all
+      platform:
+        type: choice
+        description: "Platform to build"
+        default: "all"
+        options:
+          - android
+          - ios
+          - all
+
+env:
+  EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
+  EXPO_APPLE_ID: ${{ secrets.EXPO_APPLE_ID }}
+  EXPO_APPLE_PASSWORD: ${{ secrets.EXPO_APPLE_PASSWORD }}
+  EXPO_TEAM_ID: ${{ secrets.EXPO_TEAM_ID }}
+  NODE_OPTIONS: --openssl-legacy-provider
+
+jobs:
+  check-skip:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    steps:
+      - name: Skip CI check
+        run: echo "Proceeding with workflow"
+
+  test:
+    needs: check-skip
+    runs-on: ubuntu-latest
+    steps:
+      - name: 🏗 Checkout repository
+        uses: actions/checkout@v4
+
+      - name: 🏗 Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: "yarn"
+
+      - name: 📦 Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+
+      - name: 📦 Setup yarn cache
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: 📦 Install dependencies
+        run: yarn install
+
+      - name: 🧪 Run TypeScript check
+        run: yarn tsc
+
+      - name: 🧹 Run ESLint
+        run: yarn lint
+
+      - name: 🎨 Run Prettier check
+        run: yarn format:check
+
+      - name: 🧪 Run Jest Tests
+        run: yarn test
+
+      - name: 🧪 Run React Native Testing Library Tests
+        run: yarn test:rntl
+
+  build-and-deploy:
+    needs: test
+    if: (github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master')) || github.event_name == 'workflow_dispatch'
+    strategy:
+      matrix:
+        platform: [android]
+        include:
+          - platform: ios
+            runs-on: macos-latest
+    runs-on: ${{ matrix.platform == 'ios' && 'macos-latest' || 'ubuntu-latest' }}
+    steps:
+      - name: 🏗 Checkout repository
+        uses: actions/checkout@v4
+
+      - name: 🏗 Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: "yarn"
+
+      - name: 📦 Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+
+      - name: 📦 Setup yarn cache
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: 📦 Install dependencies
+        run: |
+          yarn install
+          yarn global add eas-cli@latest
+
+      - name: 📱 Setup EAS build cache
+        uses: actions/cache@v3
+        with:
+          path: ~/.eas-build-local
+          key: ${{ runner.os }}-eas-build-local-${{ hashFiles('**/package.json') }}
+          restore-keys: |
+            ${{ runner.os }}-eas-build-local-
+
+      - name: 🔄 Verify EAS CLI installation
+        run: |
+          echo "EAS CLI version:"
+          eas --version
+
+      - name: 📋 Fix package.json main entry
+        run: |
+          # Check if jq is installed, if not install it
+          if ! command -v jq &> /dev/null; then
+            echo "Installing jq..."
+            sudo apt-get update && sudo apt-get install -y jq
+          fi
+
+          # Fix the main entry in package.json
+          if [ -f ./package.json ]; then
+            # Create a backup
+            cp package.json package.json.bak
+            # Update the package.json
+            jq '.main = "node_modules/expo/AppEntry.js"' package.json > package.json.tmp && mv package.json.tmp package.json
+            echo "Updated package.json main entry"
+            cat package.json | grep "main"
+          else
+            echo "package.json not found"
+            exit 1
+          fi
+
+      - name: 📋 Update metro.config.js for SVG support
+        run: |
+          if [ -f ./metro.config.js ]; then
+            echo "Creating backup of metro.config.js"
+            cp ./metro.config.js ./metro.config.js.backup
+            echo "Updating metro.config.js to CommonJS format"
+            cat > ./metro.config.js << 'EOFMARKER'
+          /* eslint-disable @typescript-eslint/no-var-requires */
+          const { getDefaultConfig } = require('expo/metro-config');
+
+          const config = getDefaultConfig(__dirname);
+
+          const { transformer, resolver } = config;
+
+          config.transformer = {
+            ...transformer,
+            babelTransformerPath: require.resolve('react-native-svg-transformer/expo'),
+          };
+
+          config.resolver = {
+            ...resolver,
+            assetExts: resolver.assetExts.filter(ext => ext !== 'svg'),
+            sourceExts: [...resolver.sourceExts, 'svg'],
+          };
+
+          module.exports = config;
+          EOFMARKER
+            echo "metro.config.js updated to CommonJS format"
+          else
+            echo "metro.config.js not found"
+          fi
+
+      - name: 📱 Build Development APK
+        if: github.event.inputs.buildType == 'all' || github.event.inputs.buildType == 'dev' || github.event_name == 'push' && (matrix.platform == 'android' || github.event.inputs.platform == 'all' || github.event.inputs.platform == 'android')
+        run: |
+          # Build with increased memory limit
+          export NODE_OPTIONS="--openssl-legacy-provider --max_old_space_size=4096"
+          eas build --platform android --profile development --local --non-interactive --output=./app-dev.apk
+        env:
+          NODE_ENV: development
+
+      - name: 📱 Build Production APK
+        if: github.event.inputs.buildType == 'all' || github.event.inputs.buildType == 'prod-apk' || github.event_name == 'push' && (matrix.platform == 'android' || github.event.inputs.platform == 'all' || github.event.inputs.platform == 'android')
+        run: |
+          export NODE_OPTIONS="--openssl-legacy-provider --max_old_space_size=4096"
+          eas build --platform android --profile production-apk --local --non-interactive --output=./app-prod.apk
+        env:
+          NODE_ENV: production
+
+      - name: 📱 Build Production AAB
+        if: github.event.inputs.buildType == 'all' || github.event.inputs.buildType == 'prod-aab' || github.event_name == 'push' && (matrix.platform == 'android' || github.event.inputs.platform == 'all' || github.event.inputs.platform == 'android')
+        run: |
+          export NODE_OPTIONS="--openssl-legacy-provider --max_old_space_size=4096"
+          eas build --platform android --profile production --local --non-interactive --output=./app-prod.aab
+        env:
+          NODE_ENV: production
+
+      - name: 📱 Build iOS Development
+        if: (github.event.inputs.buildType == 'all' || github.event.inputs.buildType == 'ios-dev') && (matrix.platform == 'ios' || github.event.inputs.platform == 'all' || github.event.inputs.platform == 'ios')
+        run: |
+          export NODE_OPTIONS="--openssl-legacy-provider --max_old_space_size=4096"
+          eas build --platform ios --profile development --local --non-interactive --output=./app-ios-dev.app
+        env:
+          NODE_ENV: development
+
+      - name: 📱 Build iOS Production
+        if: (github.event.inputs.buildType == 'all' || github.event.inputs.buildType == 'ios-prod') && (matrix.platform == 'ios' || github.event.inputs.platform == 'all' || github.event.inputs.platform == 'ios')
+        run: |
+          export NODE_OPTIONS="--openssl-legacy-provider --max_old_space_size=4096"
+          eas build --platform ios --profile production --local --non-interactive --output=./app-ios-prod.ipa
+        env:
+          NODE_ENV: production
+
+      - name: 📦 Upload build artifacts to GitHub
+        uses: actions/upload-artifact@v4
+        with:
+          name: app-builds
+          path: |
+            ./app-dev.apk
+            ./app-prod.apk
+            ./app-prod.aab
+            ./app-ios-dev.app
+            ./app-ios-prod.ipa
+          retention-days: 7
diff --git a/src/app/(app)/_layout.tsx b/src/app/(app)/_layout.tsx
@@ -26,7 +26,7 @@ import { securityStore } from '@/stores/security/store';
 
 export default function TabLayout() {
   const { t } = useTranslation();
-  const { status, setIsOnboarding } = useAuthStore();
+  const { status } = useAuthStore();
   const [isFirstTime, _setIsFirstTime] = useIsFirstTime();
   const [isOpen, setIsOpen] = React.useState(false);
   const [isNotificationsOpen, setIsNotificationsOpen] = React.useState(false);
@@ -69,7 +69,7 @@ export default function TabLayout() {
   const rights = securityStore((state) => state.rights);
 
   if (isFirstTime) {
-    setIsOnboarding();
+    //setIsOnboarding();
     return <Redirect href="/onboarding" />;
   }
   if (status === 'signedOut') {
diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
@@ -110,23 +110,32 @@ function RootLayout() {
 
 function Providers({ children }: { children: React.ReactNode }) {
   const colorScheme = useColorScheme();
+
+  const renderContent = () => (
+    <APIProvider>
+      <GluestackUIProvider mode={(colorScheme ?? 'light') as 'light' | 'dark'}>
+        <ThemeProvider value={colorScheme === 'dark' ? DarkTheme : DefaultTheme}>
+          <BottomSheetModalProvider>
+            {children}
+            <LiveKitBottomSheet />
+            <FlashMessage position="top" />
+          </BottomSheetModalProvider>
+        </ThemeProvider>
+      </GluestackUIProvider>
+    </APIProvider>
+  );
+
   return (
     <SafeAreaProvider>
       <GestureHandlerRootView>
         <KeyboardProvider>
-          <PostHogProvider apiKey={Env.POSTHOG_API_KEY} options={{ host: Env.POSTHOG_HOST }}>
-            <APIProvider>
-              <GluestackUIProvider mode={(colorScheme ?? 'light') as 'light' | 'dark'}>
-                <ThemeProvider value={colorScheme === 'dark' ? DarkTheme : DefaultTheme}>
-                  <BottomSheetModalProvider>
-                    {children}
-                    <LiveKitBottomSheet />
-                    <FlashMessage position="top" />
-                  </BottomSheetModalProvider>
-                </ThemeProvider>
-              </GluestackUIProvider>
-            </APIProvider>
-          </PostHogProvider>
+          {Env.POSTHOG_API_KEY ? (
+            <PostHogProvider apiKey={Env.POSTHOG_API_KEY} options={{ host: Env.POSTHOG_HOST }}>
+              {renderContent()}
+            </PostHogProvider>
+          ) : (
+            renderContent()
+          )}
         </KeyboardProvider>
       </GestureHandlerRootView>
     </SafeAreaProvider>
diff --git a/src/app/onboarding.tsx b/src/app/onboarding.tsx
@@ -1,7 +1,7 @@
 import { useRouter } from 'expo-router';
 import { Bell, ChevronRight, MapPin, Users } from 'lucide-react-native';
 import { useColorScheme } from 'nativewind';
-import React, { useRef, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { Dimensions, FlatList, Image } from 'react-native';
 import Animated, { useAnimatedStyle, useSharedValue, withTiming } from 'react-native-reanimated';
 
@@ -10,6 +10,7 @@ import { Button, ButtonText } from '@/components/ui/button';
 import { Pressable } from '@/components/ui/pressable';
 import { Text } from '@/components/ui/text';
 import { useIsFirstTime } from '@/lib/storage';
+import { useAuthStore } from '@/lib/auth';
 
 const { width } = Dimensions.get('window');
 
@@ -59,12 +60,17 @@ const Pagination: React.FC<{ currentIndex: number; length: number }> = ({ curren
 
 export default function Onboarding() {
   const [_, setIsFirstTime] = useIsFirstTime();
+  const { status, setIsOnboarding } = useAuthStore();
   const router = useRouter();
   const [currentIndex, setCurrentIndex] = useState(0);
   const flatListRef = useRef<FlatList>(null);
   const buttonOpacity = useSharedValue(0);
   const { colorScheme } = useColorScheme();
 
+  useEffect(() => {
+    setIsOnboarding();
+  }, []);
+
   const handleScroll = (event: { nativeEvent: { contentOffset: { x: number } } }) => {
     const index = Math.round(event.nativeEvent.contentOffset.x / width);
     setCurrentIndex(index);
