Skip to content
This repository was archived by the owner on Aug 12, 2022. It is now read-only.

Commit bac16a6

Browse files
authored
Enable Carthage GitHub checks (#394)
1 parent e68617c commit bac16a6

File tree

8 files changed

+44
-29
lines changed

8 files changed

+44
-29
lines changed

.github/workflows/build.yml

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,36 @@ jobs:
4242
device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}'`
4343
xcodebuild build -scheme R2TestApp -destination "platform=$platform,name=$device"
4444
45-
# Carthage is failing before Big Sur.
46-
# carthage:
47-
# name: Carthage integration
48-
# runs-on: macos-latest
49-
# steps:
50-
# - name: Checkout
51-
# uses: actions/checkout@v2
52-
# - name: Install dependencies
53-
# run: brew install xcodegen
54-
# - name: Generate project
55-
# run: make carthage
56-
# - name: Build
57-
# run: |
58-
# device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}'`
59-
# xcodebuild build -scheme R2TestApp -destination "platform=$platform,name=$device"
45+
carthage:
46+
name: Carthage integration
47+
runs-on: macos-latest
48+
steps:
49+
- name: Checkout
50+
uses: actions/checkout@v2
51+
- name: Install dependencies
52+
run: brew install xcodegen
53+
- name: Generate project
54+
run: make carthage
55+
- name: Build
56+
run: |
57+
device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}'`
58+
xcodebuild build -scheme R2TestApp -destination "platform=$platform,name=$device"
59+
60+
carthage_lcp:
61+
name: Carthage integration (LCP)
62+
runs-on: macos-latest
63+
environment: LCP
64+
steps:
65+
- name: Checkout
66+
uses: actions/checkout@v2
67+
- name: Install dependencies
68+
run: brew install xcodegen
69+
- name: Generate project
70+
run: make carthage lcp=${{ secrets.LCP_URL_CARTHAGE }}
71+
- name: Build
72+
run: |
73+
device=`xcrun xctrace list devices 2>&1 | grep -oE 'iPhone.*?[^\(]+' | head -1 | awk '{$1=$1;print}'`
74+
xcodebuild build -scheme R2TestApp -destination "platform=$platform,name=$device"
6075
6176
cocoapods:
6277
name: CocoaPods integration

Integrations/Carthage/Cartfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ github "stephencelis/SQLite.swift" ~> 0.12.2
55
github "scinfu/SwiftSoup" ~> 2.3.2
66

77
# Readium 2 dependencies
8-
github "readium/r2-shared-swift" ~> 2.0.0
9-
github "readium/r2-streamer-swift" ~> 2.0.0
10-
github "readium/r2-navigator-swift" ~> 2.0.0
11-
github "readium/r2-opds-swift" ~> 2.0.0
8+
github "readium/r2-shared-swift" "develop"
9+
github "readium/r2-streamer-swift" "develop"
10+
github "readium/r2-navigator-swift" "develop"
11+
github "readium/r2-opds-swift" "develop"

Integrations/Carthage/Cartfile+lcp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ github "stephencelis/SQLite.swift" ~> 0.12.2
55
github "scinfu/SwiftSoup" ~> 2.3.2
66

77
# Readium 2 dependencies
8-
github "readium/r2-shared-swift" ~> 2.0.0
9-
github "readium/r2-streamer-swift" ~> 2.0.0
10-
github "readium/r2-navigator-swift" ~> 2.0.0
11-
github "readium/r2-opds-swift" ~> 2.0.0
12-
github "readium/r2-lcp-swift" ~> 2.0.0
8+
github "readium/r2-shared-swift" "develop"
9+
github "readium/r2-streamer-swift" "develop"
10+
github "readium/r2-navigator-swift" "develop"
11+
github "readium/r2-opds-swift" "develop"
12+
github "readium/r2-lcp-swift" "develop"

0 commit comments

Comments
 (0)