Fixing Issue #35

* Upgrade to Swift 5.5 - 5.71 * Upgrade CI
brightdigit · Nov 18, 2022 · 1dce093 · 1dce093
2 parents cc1a357 + 562acd8
commit 1dce093
Show file tree

Hide file tree

Showing 24 changed files with 604 additions and 302 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/syndikit.yml b/.github/workflows/syndikit.yml
@@ -1,12 +1,8 @@
 name: SyndiKit
 on:
   push:
-    branches:
-      - '*'
-      - 'feature/*'
-      - 'release/*'
-      - 'bugfix/*'
-    tags: '*'
+    branches-ignore:
+      - '*WIP'
 jobs:
   build-ubuntu:
     name: Build on Ubuntu
@@ -18,18 +14,47 @@ jobs:
     strategy:
       matrix:
         runs-on: [ubuntu-18.04, ubuntu-20.04]
-        swift-version: [5.2.4, 5.3.3, 5.4.1, 5.5]
+        swift-version: [5.5.2, 5.6.2, 5.7]
+        include:
+          - runs-on: ubuntu-22.04
+            swift-version: 5.7.1
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - name: Cache swift package modules
+        id: cache-spm-linux
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-spm
+        with:
+          path: .build
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('Package.resoved') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
       - 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@v3
+        env:
+          cache-name: cache-swift
+        with:
+          path: swift-${{ env.SWIFT_VER }}-RELEASE-ubuntu${{ env.RELEASE_DOT }}
+          key: ${{ runner.os }}-${{ env.RELEASE_DOT }}-${{ env.cache-name }}-${{ env.SWIFT_VER }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
       - 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
@@ -51,41 +76,110 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     strategy:
       matrix:
-        runs-on: [macos-11, macos-10.15]
-        xcode: ["/Applications/Xcode_12.4.app", "/Applications/Xcode_11.7.app"]
         include:
-          - runs-on: macos-10.15
-            xcode: "/Applications/Xcode_11.6.app"
-          - runs-on: macos-10.15
-            xcode: "/Applications/Xcode_11.5.app"
-          - runs-on: macos-10.15
-            xcode: "/Applications/Xcode_11.4.1.app"
-          - runs-on: macos-11
-            xcode: "/Applications/Xcode_13.0.app"
-          - runs-on: macos-11
-            xcode: "/Applications/Xcode_12.5.1.app"
+          - runs-on: macos-12
+            xcode: "/Applications/Xcode_13.3.app"
+            iOSVersion: 15.4
+            watchOSVersion: 8.5
+            watchName: "Apple Watch Series 7 - 41mm"
+          - runs-on: macos-12
+            xcode: "/Applications/Xcode_13.4.1.app"
+            iOSVersion: 15.5
+            watchOSVersion: 8.5
+            watchName: "Apple Watch Series 7 - 41mm"
+          - runs-on: macos-12
+            xcode: "/Applications/Xcode_14.0.1.app"
+            iOSVersion: "16.0"
+            watchOSVersion: "9.0"
+            watchName: "Apple Watch Series 8 (41mm)"
+          - runs-on: macos-12
+            xcode: "/Applications/Xcode_14.1.app"
+            iOSVersion: "16.1"
+            watchOSVersion: "9.1"
+            watchName: "Apple Watch Ultra (49mm)"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - name: Cache swift package modules
+        id: cache-spm-macos
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-spm
+        with:
+          path: .build
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('Package.resoved') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+      - name: Cache mint
+        id: cache-mint
+        uses: actions/cache@v3
+        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 }}-
+        if: startsWith(matrix.xcode,'/Applications/Xcode_14')
       - 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
+        run: |
+          brew update
+          brew install mint
+        if: startsWith(matrix.xcode,'/Applications/Xcode_14')
       - name: Build
-        run: swift build -v
-      - name: Lint
-        if: startsWith(github.ref, 'refs/tags/') != true
-        run: swift run swiftformat --lint . && swift run swiftlint
-      - name: Run tests
+        run: swift build
+      - name: Run Swift Package tests
         run: swift test -v --enable-code-coverage
-      - name: Prepare Code Coverage
-        run: xcrun llvm-cov export -format="lcov" .build/debug/${{ env.PACKAGE_NAME }}PackageTests.xctest/Contents/MacOS/${{ env.PACKAGE_NAME }}PackageTests -instr-profile .build/debug/codecov/default.profdata > info.lcov
-      - name: Upload to CodeCov.io
-        run: bash <(curl https://codecov.io/bash) -F github -F macOS -F ${{ matrix.runs-on }}
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-      - name: Build sourcedocs Documentation
-        if: ${{ matrix.os == 'macos-11' && matrix.xcode == '/Applications/Xcode_13.0.app' && !startsWith(github.ref, 'refs/tags/') }}
-        run: "swift run sourcedocs generate build -cra\ngit config --local user.email \"[email protected]\"\ngit config --local user.name \"GitHub Action\"\ngit status\ngit add Documentation\ngit diff-index --quiet HEAD || git commit -m \"[github action] Update Docs\"\ngit push    \n"
+      - uses: sersoft-gmbh/swift-coverage-action@v2
+      - name: Upload SPM coverage to Codecov
+        uses: codecov/codecov-action@v2
+        with:
+          fail_ci_if_error: true
+          flags: spm
+          verbose: true
+          token: ${{ secrets.CODECOV_TOKEN }}
+      - name: Clean up spm build directory
+        run: rm -rf .build
+      - name: Lint
+        run: ./scripts/lint.sh
+        if: startsWith(matrix.xcode,'/Applications/Xcode_14')
+      - name: Dump PIF
+        run: |
+          swift package dump-pif > /dev/null
+          MAX_ATTEMPT=3
+          ATTEMPT=0
+          while [ -z $SUCCESS ] && [ "$ATTEMPT" -le "$MAX_ATTEMPT" ]; do
+            xcodebuild clean -scheme FloxBxUI -destination 'generic/platform=iOS' | grep -q "CLEAN SUCCEEDED" && SUCCESS=true
+            ATTEMPT=$(($ATTEMPT+1))
+          done
+        if: matrix.xcode == '/Applications/Xcode_14.1.app'
+      - name: Run iOS target tests
+        run: xcodebuild test -scheme SyndiKit -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13,OS=${{ matrix.iOSVersion }}' -enableCodeCoverage YES build test
+      - uses: sersoft-gmbh/swift-coverage-action@v2
+      - name: Upload iOS coverage to Codecov
+        uses: codecov/codecov-action@v2
+        with:
+          fail_ci_if_error: true
+          flags: iOS,iOS-${{ matrix.iOSVersion }}
+          verbose: true
+          token: ${{ secrets.CODECOV_TOKEN }}       
+      - name: Run watchOS target tests
+        run: xcodebuild test -scheme SyndiKit -sdk watchsimulator -destination 'platform=watchOS Simulator,name=${{ matrix.watchName }},OS=${{ matrix.watchOSVersion }}' -enableCodeCoverage YES build test
+      - uses: sersoft-gmbh/swift-coverage-action@v2
+      - name: Upload watchOS coverage to Codecov
+        uses: codecov/codecov-action@v2
+        with:
+          fail_ci_if_error: true
+          flags: watchOS,watchOS${{ matrix.watchOSVersion }}
+          verbose: true
+          token: ${{ secrets.CODECOV_TOKEN }}
   deploy:
     name: Deploy to Netlify
     needs: [build-macos, build-ubuntu]
@@ -104,4 +198,4 @@ jobs:
       - name: Build DocC Documentation
         run: xcodebuild docbuild -scheme ${{ env.PACKAGE_NAME }} -destination 'platform=macOS' -derivedDataPath DerivedData
       - name: Deploy Files
-        run: netlify deploy --site ${{ secrets.NETLIFY_SITE_ID }} --auth ${{ secrets.NETLIFY_AUTH_TOKEN }} --prod
+        run: netlify deploy --site ${{ secrets.NETLIFY_SITE_ID }} --auth ${{ secrets.NETLIFY_AUTH_TOKEN }} --prod
diff --git a/.gitignore b/.gitignore
@@ -142,4 +142,5 @@ xcuserdata
 **/xcshareddata/WorkspaceSettings.xcsettings
 
 # End of https://www.toptal.com/developers/gitignore/api/swift,swiftpm,swiftpackagemanager,xcode,macos
-Output
+Output
+.mint
diff --git a/.periphery.yml b/.periphery.yml
@@ -0,0 +1 @@
+{}
diff --git a/.travis.yml b/.travis.yml
-Original file line number
+Diff line change
@@ Expand Up / @@ -142,4 +142,5 @@ xcuserdata @@
     **/xcshareddata/WorkspaceSettings.xcsettings
     # End of https://www.toptal.com/developers/gitignore/api/swift,swiftpm,swiftpackagemanager,xcode,macos
-    Output
+    Output
+    .mint