Fix for CI validation

Author: ra1028

.github/workflows/test.yml

@@ -5,45 +5,6 @@ on:
     branches:
       - main
 jobs:
-  validation:
-    name: Validation
-    runs-on: macOS-11.0
-    strategy:
-      matrix:
-        xcode_version:
-          - "12.2"
-    env:
-      DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode_version }}.app
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Get ruby gem cache
-        id: gem-cache
-        uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-1-gem-${{ hashFiles('Gemfile.lock') }}
-          restore-keys: ${{ runner.os }}-1-gem-
-
-      - name: Install ruby gems
-        if: steps.gem-cache.cache.outputs.cache-hit != 'true'
-        run: make gem
-
-      - name: Get SwiftPM cache
-        uses: actions/cache@v2
-        with:
-          path: Tools/.build
-          key: ${{ runner.os }}-${{ matrix.xcode_version }}-1-spm-${{ hashFiles('Tools/Package.resolved') }}
-          restore-keys: ${{ runner.os }}-${{ matrix.xcode_version }}-1-spm-
-
-      - name: Podspec lint
-        run: make pod-lib-lint
-
-      - name: Validation
-        run: make all && [ -z "$(git status --porcelain)" ] && make lint
-        env:
-          SPM_FORCE_BUILD: 1
-
   test:
     name: Test on macOS
     runs-on: macOS-11.0
@@ -76,6 +37,13 @@ jobs:
           key: ${{ runner.os }}-0-npm-${{ hashFiles('package-lock.json') }}
           restore-keys: ${{ runner.os }}-0-npm-
 
+      - name: Get SwiftPM cache
+        uses: actions/cache@v2
+        with:
+          path: Tools/.build
+          key: ${{ runner.os }}-${{ matrix.xcode_version }}-1-spm-${{ hashFiles('Tools/Package.resolved') }}
+          restore-keys: ${{ runner.os }}-${{ matrix.xcode_version }}-1-spm-
+
       - name: Get CocoaPods cache
         id: cocoapods-cache
         uses: actions/cache@v2
@@ -92,9 +60,11 @@ jobs:
         if: steps.gem-cache.cache.outputs.cache-hit != 'true'
         run: make gem
 
-      - name: Install CocoaPods packages
-        if: steps.cocoapods-cache.cache.outputs.cache-hit != 'true'
-        run: make pod-install
+      - name: Podspec lint
+        run: make pod-lib-lint
+
+      - name: Validation
+        run: make all && [ -z "$(git status --porcelain)" ] && make lint
 
       - name: Generate snapshots
         run: set -o pipefail && xcodebuild build-for-testing test-without-building -workspace Example/Example.xcworkspace -scheme SampleApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 12 Pro' ENABLE_TESTABILITY=YES | xcpretty -c

.gitignore

@@ -20,6 +20,8 @@ build/
 archive/
 *.xcframework
 *.xcworkspacedata
+*.xcworkspace
+*.xcodeproj
 
 ## Gem
 .bundle

Example/Example.xcodeproj/project.pbxproj

@@ -1,6 +1,9 @@
-use_frameworks!
 platform :ios, '14.0'
 source 'https://cdn.cocoapods.org/'
+use_frameworks!
+inhibit_all_warnings!
+
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
 
 target 'SampleApp' do
 	inherit! :search_paths
@@ -11,6 +14,5 @@ end
 target 'SampleAccessibilitySnapshot' do
 	inherit! :search_paths
 
-	pod 'PlaybookSnapshot', '~> 0.2.0'
 	pod 'PlaybookAccessibilitySnapshot', :path => '../PlaybookAccessibilitySnapshot.podspec'
 end

Example/Example.xcodeproj/xcshareddata/xcschemes/SampleApp.xcscheme

@@ -12,7 +12,6 @@ PODS:
 DEPENDENCIES:
   - Playbook (~> 0.2.0)
   - PlaybookAccessibilitySnapshot (from `../PlaybookAccessibilitySnapshot.podspec`)
-  - PlaybookSnapshot (~> 0.2.0)
 
 SPEC REPOS:
   trunk:
@@ -32,6 +31,6 @@ SPEC CHECKSUMS:
   PlaybookAccessibilitySnapshot: a2c8e153a1bae7e9e1527d5f37f272bd3f3cdfcd
   PlaybookSnapshot: 5a1caa4eab596c0da23613b15c506bdbeeedc8c0
 
-PODFILE CHECKSUM: faa37e96a1de8eb0b94cdf3058d4e2a635174bf9
+PODFILE CHECKSUM: f338bdd8abed3a3355aaa32bab8dc4ee0137d714
 
 COCOAPODS: 1.10.0

Example/Example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,5 +1,5 @@
 # How to Run
 
-1. Run `make all` at the root of this repository.
+1. Run `make proj` at the root of this repository.
 1. Open `Example.xcworkspace` via Xcode.
 1. Test (⌘+U) `SampleApp` scheme to generate accessibility snapshot images.

Example/Podfile

@@ -3,22 +3,20 @@ GITHUB_RAW_CONTENT_PATH := https://raw.githubusercontent.com/playbook-ui/accessi
 GITHUB_TREE_PATH := https://github.com/playbook-ui/accessibility-snapshot-ios/main/
 
 .PHONY: all
-all: proj pod-install mod format
+all: proj format
 
 .PHONY: proj
 proj:
 	$(SWIFT_TOOL) xcodegen --spec Example/project.yml --project Example
+	make pod-install
 
 .PHONY: pod-install
 pod-install:
 	bundle exec pod install --project-directory=Example || bundle exec pod install --repo-update --project-directory=Example
 
-.PHONY: mod
-mod:
-	$(SWIFT_TOOL) swift-mod
-
 .PHONY: format
 format:
+	$(SWIFT_TOOL) swift-mod
 	$(SWIFT_TOOL) swift-format --configuration .swift-format.json -i -r -m format Sources Example/SampleAccessibilitySnapshot
 
 .PHONY: lint

Example/Podfile.lock

@@ -76,6 +76,14 @@ end
 
 ---
 
+## Development
+
+1. Run `make proj` at the root of this repository.
+1. Open `Example/Example.xcworkspace` via Xcode.
+1. Develop a PlaybookAccessibilitySnapshot installed as a development pods.
+
+---
+
 ## License
 
 Playbook is released under the [Apache 2.0 License](https://github.com/playbook-ui/accessibility-snapshot-ios/tree/main/LICENSE).