Fix Fastfile formatting and clean TestFlight workflow

Author: rinaus2004-droid

.github/workflows/octreotide-ci.yml

@@ -15,42 +15,105 @@ jobs:
   test:
     name: Run Tests
     runs-on: macos-latest
+    strategy:
+      matrix:
+        xcode: ['14.3.1']  # Add more versions if needed
+        device: ['iPhone 14', 'iPhone 14 Pro', 'iPad Pro (12.9-inch) (6th generation)']
 
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: recursive
 
-    - name: Select Xcode
-      run: sudo xcode-select -s /Applications/Xcode.app
-      
-    - name: List Available Schemes
-      run: xcodebuild -workspace LoopWorkspace.xcworkspace -list
+    - name: Select Xcode ${{ matrix.xcode }}
+      run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
 
-    - name: Build and Test
+    - name: Run Unit Tests
       run: |
         xcodebuild test \
           -workspace LoopWorkspace.xcworkspace \
           -scheme LoopWorkspace \
-          -destination 'platform=iOS Simulator,name=iPhone 14,OS=latest' \
+          -destination "platform=iOS Simulator,name=${{ matrix.device }},OS=latest" \
+          -only-testing:OctreotideAlgorithmTests \
           -enableCodeCoverage YES \
           -resultBundlePath TestResults.xcresult
       
     - name: Upload Test Results
       if: always()
       uses: actions/upload-artifact@v3
       with:
-        name: test-results
+        name: test-results-${{ matrix.device }}
         path: TestResults.xcresult
 
     - name: Generate Coverage Report
       if: success()
       run: |
-        xcrun xccov view --report TestResults.xcresult > coverage.txt
+        xcrun xccov view --report TestResults.xcresult > coverage-${{ matrix.device }}.txt
         
     - name: Upload Coverage
       if: success()
       uses: actions/upload-artifact@v3
       with:
-        name: code-coverage
-        path: coverage.txt
+        name: code-coverage-${{ matrix.device }}
+        path: coverage-${{ matrix.device }}.txt
+
+  integration-tests:
+    name: Integration Tests
+    needs: unit-tests
+    runs-on: macos-latest
+    
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+        
+    - name: Select Xcode
+      run: sudo xcode-select -s /Applications/Xcode.app
+        
+    - name: Run Simulation Tests
+      run: |
+        # Run simulator with different glucose patterns
+        xcodebuild test \
+          -workspace LoopWorkspace.xcworkspace \
+          -scheme LoopWorkspace \
+          -destination 'platform=iOS Simulator,name=iPhone 14,OS=latest' \
+          -only-testing:GlucoseSimulatorTests \
+          -resultBundlePath SimResults.xcresult
+          
+    - name: Upload Simulation Results
+      if: always()
+      uses: actions/upload-artifact@v3
+      with:
+        name: simulation-results
+        path: SimResults.xcresult
+        
+  build-only:
+    name: Build Without Signing
+    needs: [unit-tests, integration-tests]
+    runs-on: macos-latest
+    
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+        
+    - name: Select Xcode
+      run: sudo xcode-select -s /Applications/Xcode.app
+        
+    - name: Build for Simulator
+      run: |
+        xcodebuild build \
+          -workspace LoopWorkspace.xcworkspace \
+          -scheme LoopWorkspace \
+          -destination 'platform=iOS Simulator,name=iPhone 14,OS=latest' \
+          -configuration Debug \
+          CODE_SIGN_IDENTITY="" \
+          CODE_SIGNING_REQUIRED=NO \
+          CODE_SIGNING_ALLOWED=NO
+          
+    - name: Archive Build Logs
+      if: always()
+      uses: actions/upload-artifact@v3
+      with:
+        name: build-logs
+        path: ~/Library/Developer/Xcode/DerivedData/**/Logs/Build

.github/workflows/testflight-upload.yml

@@ -9,8 +9,8 @@ on:
         default: 'development'
         type: choice
         options:
-        - development
-        - release
+          - development
+          - release
 
 env:
   DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
@@ -22,23 +22,23 @@ jobs:
   build-and-upload:
     name: Build and Upload to TestFlight
     runs-on: macos-latest
-    
+
     steps:
     - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-        
+        with:
+          submodules: recursive
+
     - name: Install Apple Certificate
-      env:
-        BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
-        P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
-        KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
-      run: |
+        env:
+          BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
+          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+        run: |
         # Create keychain
-        security create-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
-        security default-keychain -s build.keychain
-        security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
-        security set-keychain-settings -t 3600 -u build.keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
+          security default-keychain -s build.keychain
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
+          security set-keychain-settings -t 3600 -u build.keychain
 
         # Import certificate
         echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output certificate.p12
@@ -53,32 +53,32 @@ jobs:
     - name: Setup Provisioning
       env:
         MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
-        FASTLANE_KEY: ${{ secrets.FASTLANE_KEY }}
-      run: |
+          FASTLANE_KEY: ${{ secrets.FASTLANE_KEY }}
+        run: |
         # Create fastlane match config
         echo "FASTLANE_KEY='$FASTLANE_KEY'" > .env
         bundle exec fastlane match appstore
-        
+
     - name: Build and Upload
-      env:
-        MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
-        FASTLANE_KEY: ${{ secrets.FASTLANE_KEY }}
-      run: |
-        if [ "${{ github.event.inputs.build_type }}" = "release" ]; then
+        env:
+          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+          FASTLANE_KEY: ${{ secrets.FASTLANE_KEY }}
+        run: |
+          if [ "${{ github.event.inputs.build_type }}" = "release" ]; then
           bundle exec fastlane release
-        else
-          bundle exec fastlane beta
-        fi
-        
+          else
+            bundle exec fastlane beta
+          fi
+
     - name: Upload IPA
-      uses: actions/upload-artifact@v3
-      with:
-        name: loop-ipa
+        uses: actions/upload-artifact@v3
+        with:
+          name: loop-ipa
         path: |
           Loop.ipa
           ExportOptions.plist
-          
-    - name: Clean up keychain
-      if: always()
-      run: |
+
+      - name: Clean up keychain
+        if: always()
+        run: |
         security delete-keychain build.keychain