From 3777765645a0ca25a2cdd53df5a901a492315800 Mon Sep 17 00:00:00 2001 From: leogdion Date: Mon, 5 Dec 2022 09:02:14 -0500 Subject: [PATCH] making itunes owner email optional (#41) --- .github/workflows/syndikit.yml | 18 ++++++++---------- Data/XML/empowerapps-show.xml | 1 - .../Formats/Media/iTunes/iTunesOwner.swift | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/syndikit.yml b/.github/workflows/syndikit.yml index 87a3bb6..5d7271b 100644 --- a/.github/workflows/syndikit.yml +++ b/.github/workflows/syndikit.yml @@ -27,7 +27,7 @@ jobs: cache-name: cache-spm with: path: .build - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('Package.resoved') }} + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('Package.resolved') }} restore-keys: | ${{ runner.os }}-build-${{ env.cache-name }}- ${{ runner.os }}-build- @@ -106,12 +106,13 @@ jobs: cache-name: cache-spm with: path: .build - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('Package.resoved') }} + 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 + if: ${{ github.event_name == 'pull_request' && github.base_ref == 'main' && matrix.xcode == '/Applications/Xcode_14.1.app' }} id: cache-mint uses: actions/cache@v3 env: @@ -123,16 +124,15 @@ jobs: ${{ 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 + if: ${{ github.event_name == 'pull_request' && github.base_ref == 'main' && matrix.xcode == '/Applications/Xcode_14.1.app' }} run: | brew update brew install mint - if: startsWith(matrix.xcode,'/Applications/Xcode_14') - name: Build run: swift build - name: Run Swift Package tests @@ -149,17 +149,17 @@ jobs: run: rm -rf .build - name: Lint run: ./scripts/lint.sh - if: startsWith(matrix.xcode,'/Applications/Xcode_14') + if: ${{ github.event_name == 'pull_request' && github.base_ref == 'main' && matrix.xcode == '/Applications/Xcode_14.1.app' }} - name: Dump PIF + if: startsWith(matrix.xcode,'/Applications/Xcode_14') 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 + xcodebuild clean -scheme SyndiKit -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 @@ -185,14 +185,12 @@ jobs: needs: [build-macos, build-ubuntu] env: PACKAGE_NAME: SyndiKit - runs-on: macos-11 + runs-on: macos-12 if: ${{ github.ref == 'refs/heads/main' }} steps: - uses: actions/checkout@v2 - name: Setup Netlify run: brew install netlify-cli - - name: Setup Xcode - run: sudo xcode-select -s /Applications/Xcode_13.0.app/Contents/Developer - name: Resolve Package Dependencies run: xcodebuild -resolvePackageDependencies -scheme ${{ env.PACKAGE_NAME }} -derivedDataPath DerivedData - name: Build DocC Documentation diff --git a/Data/XML/empowerapps-show.xml b/Data/XML/empowerapps-show.xml index 5727b1a..33d0cb3 100644 --- a/Data/XML/empowerapps-show.xml +++ b/Data/XML/empowerapps-show.xml @@ -35,7 +35,6 @@ technology, apple, business, iPhone, Mac, osx, macOS, iPad, Apple Watch Leo Dion, Principal CEO and Swift Developer at BrightDigit - leogdion@brightdigit.com No No diff --git a/Sources/SyndiKit/Formats/Media/iTunes/iTunesOwner.swift b/Sources/SyndiKit/Formats/Media/iTunes/iTunesOwner.swift index 851ed03..fa26208 100644 --- a/Sources/SyndiKit/Formats/Media/iTunes/iTunesOwner.swift +++ b/Sources/SyndiKit/Formats/Media/iTunes/iTunesOwner.swift @@ -1,7 +1,7 @@ // swiftlint:disable:next type_name public struct iTunesOwner: Codable { public let name: String - public let email: String + public let email: String? enum CodingKeys: String, CodingKey { case name = "itunes:name"