Update FeatherQuill.yml

brightdigit · Jan 28, 2025 · 87d741e · 87d741e
1 parent d4ac2ba
commit 87d741e
Showing 1 changed file with 171 additions and 205 deletions.
diff --git a/.github/workflows/FeatherQuill.yml b/.github/workflows/FeatherQuill.yml
@@ -1,227 +1,193 @@
-name: macOS
+name: FeatherQuill
 on:
   push:
     branches-ignore:
       - '*WIP'
-env:
-  PACKAGE_NAME: FeatherQuill      
+
 jobs:
-  # build-ubuntu:
-  #   name: Build on Ubuntu
-  #   env:
-  #     SWIFT_VER: ${{ matrix.swift-version }}
-  #   runs-on: ${{ matrix.runs-on }}
-  #   if: "!contains(github.event.head_commit.message, 'ci skip')"
-  #   strategy:
-  #     matrix:
-  #       runs-on: [ubuntu-20.04, ubuntu-22.04]
-  #       swift-version: ["5.9", "5.9.2", "5.10"]
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #     - name: Set Ubuntu Release DOT
-  #       run: echo "RELEASE_DOT=$(lsb_release -sr)" >> $GITHUB_ENV
-  #     - name: Set Ubuntu Release NUM
-  #       run: echo "RELEASE_NUM=${RELEASE_DOT//[-._]/}"  >> $GITHUB_ENV
-  #     - name: Set Ubuntu Codename
-  #       run: echo "RELEASE_NAME=$(lsb_release -sc)"  >> $GITHUB_ENV
-  #     - name: Cache swift package modules
-  #       id: cache-spm-linux
-  #       uses: actions/cache@v4
-  #       env:
-  #         cache-name: cache-spm
-  #       with:
-  #         path: .build
-  #         key: ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-${{ matrix.swift-version }}-${{ hashFiles('Package.resolved') }}
-  #         restore-keys: |
-  #           ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-${{ matrix.swift-version }}-
-  #           ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-
-  #     - name: Cache swift
-  #       id: cache-swift-linux
-  #       uses: actions/cache@v4
-  #       env:
-  #         cache-name: cache-swift
-  #       with:
-  #         path: swift-${{ env.SWIFT_VER }}-RELEASE-ubuntu${{ env.RELEASE_DOT }}
-  #         key: ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.swift-version }}-${{ env.RELEASE_DOT }}
-  #         restore-keys: |
-  #           ${{ runner.os }}-${{ env.cache-name }}-${{ matrix.swift-version }}-
-  #     - name: Download Swift
-  #       if: steps.cache-swift-linux.outputs.cache-hit != 'true'
-  #       run: curl -O https://download.swift.org/swift-${SWIFT_VER}-release/ubuntu${RELEASE_NUM}/swift-${SWIFT_VER}-RELEASE/swift-${SWIFT_VER}-RELEASE-ubuntu${RELEASE_DOT}.tar.gz
-  #     - name: Extract Swift
-  #       if: steps.cache-swift-linux.outputs.cache-hit != 'true'
-  #       run: tar xzf swift-${SWIFT_VER}-RELEASE-ubuntu${RELEASE_DOT}.tar.gz
-  #     - name: Add Path
-  #       run: echo "$GITHUB_WORKSPACE/swift-${SWIFT_VER}-RELEASE-ubuntu${RELEASE_DOT}/usr/bin" >> $GITHUB_PATH
-  #     - name: Test
-  #       run: swift test --enable-code-coverage 
-  #     - uses: sersoft-gmbh/swift-coverage-action@v4
-  #       id: coverage-files
-  #       with:
-  #         fail-on-empty-output: true
-  #     - name: Upload coverage to Codecov
-  #       uses: codecov/codecov-action@v4       
-  #       with:
-  #         fail_ci_if_error: true
-  #         flags: swift-${{ matrix.swift-version }},ubuntu-${{ matrix.RELEASE_DOT }}
-  #         verbose: true        
-  #         token: ${{ secrets.CODECOV_TOKEN }}  
-  #         files: ${{ join(fromJSON(steps.coverage-files.outputs.files), ',') }}        
+  build-ubuntu:
+    name: Build on Ubuntu
+    env:
+      PACKAGE_NAME: FeatherQuill
+      SWIFT_VER: ${{ matrix.swift-version }}
+    runs-on: ${{ matrix.runs-on }}
+    if: "!contains(github.event.head_commit.message, 'ci skip')"
+    strategy:
+      matrix:
+        runs-on: [ubuntu-20.04, ubuntu-22.04]
+        swift-version: [5.9, "5.10", "6.0"]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Cache swift package modules
+        id: cache-spm-linux
+        uses: actions/cache@v4
+        env:
+          cache-name: SPM
+        with:
+          path: .build
+          key: ${{ env.cache-name }}-${{ runner.os }}-${{ env.SWIFT_VER }}-${{ hashFiles('Package.resolved') }}-${{ env.RELEASE_DOT }}
+          restore-keys: |
+            ${{ env.cache-name }}-${{ runner.os }}-${{ env.SWIFT_VER }}-${{ hashFiles('Package.resolved') }}
+            ${{ env.cache-name }}-${{ runner.os }}-${{ env.SWIFT_VER }}
+      - name: Set Ubuntu Release DOT
+        run: echo "RELEASE_DOT=$(lsb_release -sr)" >> $GITHUB_ENV
+      - name: Set Ubuntu Release NUM
+        run: echo "RELEASE_NUM=${RELEASE_DOT//[-._]/}"  >> $GITHUB_ENV
+      - name: Set Ubuntu Codename
+        run: echo "RELEASE_NAME=$(lsb_release -sc)"  >> $GITHUB_ENV
+      - name: Cache swift
+        id: cache-swift-linux
+        uses: actions/cache@v4
+        env:
+          cache-name: swift
+        with:
+          path: swift-${{ env.SWIFT_VER }}-RELEASE-ubuntu${{ env.RELEASE_DOT }}
+          key: ${{ env.cache-name }}-${{ runner.os }}-${{ env.SWIFT_VER }}-${{ env.RELEASE_DOT }}
+      - name: Download Swift
+        if: steps.cache-swift-linux.outputs.cache-hit != 'true'
+        run: curl -O https://download.swift.org/swift-${SWIFT_VER}-release/ubuntu${RELEASE_NUM}/swift-${SWIFT_VER}-RELEASE/swift-${SWIFT_VER}-RELEASE-ubuntu${RELEASE_DOT}.tar.gz
+      - name: Extract Swift
+        if: steps.cache-swift-linux.outputs.cache-hit != 'true'
+        run: tar xzf swift-${SWIFT_VER}-RELEASE-ubuntu${RELEASE_DOT}.tar.gz
+      - name: Add Path
+        run: echo "$GITHUB_WORKSPACE/swift-${SWIFT_VER}-RELEASE-ubuntu${RELEASE_DOT}/usr/bin" >> $GITHUB_PATH
+      - name: Build
+        run: swift build
+      - name: Run tests
+        run: swift test --enable-test-discovery --enable-code-coverage
+      - name: Prepare Code Coverage
+        run: llvm-cov export -format="lcov" .build/x86_64-unknown-linux-gnu/debug/${{ env.PACKAGE_NAME }}PackageTests.xctest -instr-profile .build/debug/codecov/default.profdata > info.lcov
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          flags: spm,${{ env.RELEASE_NAME }},${{ env.SWIFT_VER }} 
   build-macos:
     name: Build on macOS
-    runs-on: ${{ matrix.os }}
+    env:
+      PACKAGE_NAME: FeatherQuill
+    runs-on: ${{ matrix.runs-on }}
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     strategy:
+      fail-fast: false
       matrix:
         include:
-          - xcode: "/Applications/Xcode_15.0.1.app"
-            os: macos-13
-            iOSVersion: "17.0.1"
-            watchOSVersion: "10.0"
-            watchName: "Apple Watch Series 9 (41mm)"
-            iPhoneName: "iPhone 15"
-          - xcode: "/Applications/Xcode_15.1.app"
-            os: macos-13
-            iOSVersion: "17.2"
-            watchOSVersion: "10.2"
-            watchName: "Apple Watch Series 9 (45mm)"
-            iPhoneName: "iPhone 15 Plus"
-          - xcode: "/Applications/Xcode_15.2.app"
-            os: macos-14
-            iOSVersion: "17.2"
-            watchOSVersion: "10.2"
-            watchName: "Apple Watch Ultra (49mm)"
-            iPhoneName: "iPhone 15 Pro"
-          # - xcode: "/Applications/Xcode_15.3.app"
-          #   os: macos-14
-          #   iOSVersion: "17.4"
-          #   watchOSVersion: "10.4"
-          #   watchName: "Apple Watch Ultra 2 (49mm)"
-          #   iPhoneName: "iPhone 15 Pro Max"            
+          # SPM Build Matrix
+          - runs-on: macos-13
+            xcode: "/Applications/Xcode_15.0.1.app"
+          - runs-on: macos-13
+            xcode: "/Applications/Xcode_15.1.app"
+          - runs-on: macos-13
+            xcode: "/Applications/Xcode_15.2.app"
+          - runs-on: macos-15
+            xcode: "/Applications/Xcode_16.1.app"
+          - runs-on: macos-15
+            xcode: "/Applications/Xcode_16.2.app"
+
+          # iOS Build Matrix
+          - type: ios
+            runs-on: macos-13
+            xcode: "/Applications/Xcode_15.0.1.app"
+            deviceName: "iPhone 15"
+            osVersion: "17.0.1"
+          - type: ios
+            runs-on: macos-13
+            xcode: "/Applications/Xcode_15.1.app"
+            deviceName: "iPhone 15 Pro"
+            osVersion: "17.2"
+          - type: ios
+            runs-on: macos-13
+            xcode: "/Applications/Xcode_15.2.app"
+            deviceName: "iPhone 15 Pro Max"
+            osVersion: "17.2"
+          - type: ios
+            runs-on: macos-15
+            xcode: "/Applications/Xcode_16.1.app"
+            deviceName: "iPhone 16"
+            osVersion: "18.1"
+          - type: ios
+            runs-on: macos-15
+            xcode: "/Applications/Xcode_16.2.app"
+            deviceName: "iPhone 16 Pro"
+            osVersion: "18.2"
+
+          # watchOS Build Matrix
+          - type: watchos
+            runs-on: macos-13
+            xcode: "/Applications/Xcode_15.0.1.app"
+            deviceName: "Apple Watch Series 9 (41mm)"
+            osVersion: "10.0"
+          - type: watchos
+            runs-on: macos-13
+            xcode: "/Applications/Xcode_15.1.app"
+            deviceName: "Apple Watch Series 9 (45mm)"
+            osVersion: "10.2"
+          - type: watchos
+            runs-on: macos-13
+            xcode: "/Applications/Xcode_15.2.app"
+            deviceName: "Apple Watch Ultra 2 (49mm)"
+            osVersion: "10.2"
+          - type: watchos
+            runs-on: macos-15
+            xcode: "/Applications/Xcode_16.1.app"
+            deviceName: "Apple Watch Ultra 2 (49mm)"
+            osVersion: "11.1"
+          - type: watchos
+            runs-on: macos-15
+            xcode: "/Applications/Xcode_16.2.app"
+            deviceName: "Apple Watch Ultra 2 (49mm)"
+            osVersion: "11.2"
+
     steps:
       - uses: actions/checkout@v4
-      # - name: Cache swift package modules
-      #   id: cache-spm-macos
-      #   uses: actions/cache@v4
-      #   env:
-      #     cache-name: cache-spm
-      #   with:
-      #     path: .build
-      #     key: ${{ matrix.os }}-build-${{ env.cache-name }}-${{ matrix.xcode }}-${{ hashFiles('Package.resolved') }}
-      #     restore-keys: |
-      #       ${{ matrix.os }}-build-${{ env.cache-name }}-${{ matrix.xcode }}-
-      - name: Cache mint
-        if: startsWith(matrix.xcode,'/Applications/Xcode_15.3')
-        id: cache-mint
+
+      - name: Set Xcode Name
+        run: echo "XCODE_NAME=$(basename -- ${{ matrix.xcode }} | sed 's/\.[^.]*$//' | cut -d'_' -f2)" >> $GITHUB_ENV
+
+      - name: Setup Xcode
+        run: sudo xcode-select -s ${{ matrix.xcode }}/Contents/Developer
+
+      # SPM Cache Step
+      - name: Cache swift package modules
+        id: cache-spm-macos
         uses: actions/cache@v4
         env:
-          cache-name: cache-mint
+          cache-name: cache-spm
         with:
-          path: .mint
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('Mintfile') }}
+          path: .build
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('Package.resolved') }}
           restore-keys: |
             ${{ runner.os }}-build-${{ env.cache-name }}-
             ${{ runner.os }}-build-
             ${{ runner.os }}-
-      - name: Set Xcode Name
-        run: echo "XCODE_NAME=$(basename -- ${{ matrix.xcode }} | sed 's/\.[^.]*$//' | cut -d'_' -f2)" >> $GITHUB_ENV
-      - name: Setup Xcode
-        run: sudo xcode-select -s ${{ matrix.xcode }}/Contents/Developer
-      - name: Install mint
-        if: startsWith(matrix.xcode,'/Applications/Xcode_15.3')
-        run: |
-          brew update
-          brew install mint
-      - name: Build
+  
+      - name: Build SPM
+        if: "!matrix.type"
         run: swift build
+
       - name: Run Swift Package tests
-        run: swift test --vv #--enable-code-coverage
-      # - uses: sersoft-gmbh/swift-coverage-action@v4
-      #   id: coverage-files-spm
-      #   with:
-      #     fail-on-empty-output: true
-      # - name: Upload coverage reports to Codecov
-      #   uses: codecov/codecov-action@v4        
-      #   with:
-      #     files: ${{ join(fromJSON(steps.coverage-files-spm.outputs.files), ',') }} 
-      #     token: ${{ secrets.CODECOV_TOKEN }}
-      #     flags: macOS,${{ env.XCODE_NAME }},${{ matrix.runs-on }}
-      # - name: Clean up spm build directory
-      #   run: rm -rf .build
-      # - name: Lint
-      #   run: ./scripts/lint.sh
-      #   if: startsWith(matrix.xcode,'/Applications/Xcode_15.3')
-      # - name: Run iOS target tests
-      #   run: xcodebuild test -scheme ${{ env.PACKAGE_NAME }} -sdk "iphonesimulator" -destination 'platform=iOS Simulator,name=${{ matrix.iPhoneName }},OS=${{ matrix.iOSVersion }}' -enableCodeCoverage YES build test
-      # - uses: sersoft-gmbh/swift-coverage-action@v4
-      #   id: coverage-files-iOS
-      #   with:
-      #     fail-on-empty-output: true
-      # - name: Upload coverage to Codecov
-      #   uses: codecov/codecov-action@v4       
-      #   with:
-      #     fail_ci_if_error: true
-      #     verbose: true        
-      #     token: ${{ secrets.CODECOV_TOKEN }}  
-      #     files: ${{ join(fromJSON(steps.coverage-files-iOS.outputs.files), ',') }}   
-      #     flags: iOS,iOS${{ matrix.iOSVersion }},macOS,${{ env.XCODE_NAME }}  
-      # - name: Run watchOS target tests
-      #   run: xcodebuild test -scheme ${{ env.PACKAGE_NAME }} -sdk "watchsimulator" -destination 'platform=watchOS Simulator,name=${{ matrix.watchName }},OS=${{ matrix.watchOSVersion }}' -enableCodeCoverage YES build test
-      # - uses: sersoft-gmbh/swift-coverage-action@v4
-      #   id: coverage-files-watchOS
-      #   with:
-      #     fail-on-empty-output: true
-      # - name: Upload coverage to Codecov
-      #   uses: codecov/codecov-action@v4       
-      #   with:
-      #     fail_ci_if_error: true
-      #     verbose: true        
-      #     token: ${{ secrets.CODECOV_TOKEN }}  
-      #     files: ${{ join(fromJSON(steps.coverage-files-watchOS.outputs.files), ',') }}   
-      #     flags: watchOS,watchOS${{ matrix.watchOSVersion }},macOS,${{ env.XCODE_NAME }}
-  # build-self:
-  #     name: Build on Self-Hosting macOS
-  #     runs-on: [self-hosted, macOS]
-  #     if: github.event.repository.owner.login == github.event.organization.login && !contains(github.event.head_commit.message, 'ci skip')
-  #     steps:
-  #     - uses: actions/checkout@v4
-  #     - name: Cache swift package modules
-  #       id: cache-spm-macos
-  #       uses: actions/cache@v4
-  #       env:
-  #         cache-name: cache-spm
-  #       with:
-  #         path: .build
-  #         key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('Package.resolved') }}
-  #         restore-keys: |
-  #           ${{ runner.os }}-build-${{ env.cache-name }}-
-  #           ${{ runner.os }}-build-
-  #           ${{ runner.os }}-
-  #     - name: Cache mint
-  #       id: cache-mint
-  #       uses: actions/cache@v4
-  #       env:
-  #         cache-name: cache-mint
-  #       with:
-  #         path: .mint
-  #         key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('Mintfile') }}
-  #         restore-keys: |
-  #           ${{ runner.os }}-build-${{ env.cache-name }}-
-  #           ${{ runner.os }}-build-
-  #           ${{ runner.os }}-      
-  #     - name: Build
-  #       run: swift build
-  #     - name: Run Swift Package tests
-  #       run: swift test --enable-code-coverage
-  #     - uses: sersoft-gmbh/swift-coverage-action@v4
-  #       with:
-  #         fail-on-empty-output: true
-  #     - name: Upload coverage reports to Codecov
-  #       uses: codecov/codecov-action@v4        
-  #       with:
-  #         token: ${{ secrets.CODECOV_TOKEN }}
-  #         flags: macOS,${{ env.XCODE_NAME }}
-  #     - name: Clean up spm build directory
-  #       run: rm -rf .build
-  #     - name: Lint
-  #       run: ./scripts/lint.sh
+        if: "!matrix.type"
+        run: swift test -v --enable-code-coverage
+
+      # Common iOS/watchOS Test Steps
+      - name: Run Device Tests
+        if: matrix.type
+        run: >
+          xcodebuild test
+          -scheme ${{ env.PACKAGE_NAME }}
+          -sdk ${{ matrix.type == 'ios' && 'iphonesimulator' || 'watchsimulator' }}
+          -destination 'platform=${{ matrix.type == 'ios' && 'iOS Simulator' || 'watchOS Simulator' }},name=${{ matrix.deviceName }},OS=${{ matrix.osVersion }}'
+          -enableCodeCoverage YES
+          build test
+  
+      # Common Coverage Steps
+      - name: Process Coverage
+        uses: sersoft-gmbh/swift-coverage-action@v4
+        with:
+          fail-on-empty-output: true
+
+      - name: Upload Coverage
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          flags: ${{ matrix.type && format('{0}{1}', matrix.type, matrix.osVersion) || 'spm' }}