Skip to content

Commit 7d1f63a

Browse files
garrettmoongarrettmoon
authored
Fixes up the Carthage build for downstream projects (#280)
1 parent e0fc640 commit 7d1f63a

40 files changed

+1163
-59
lines changed

‎Cartfile.resolved

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "pinterest/PINOperation" "1.1"
1+
github "pinterest/PINOperation" "1.2"

‎Carthage/Checkouts/PINOperation/.github/workflows/ci.yml

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
---
2+
name: CI
3+
4+
on:
5+
push:
6+
branches:
7+
- master
8+
- 'releases/*'
9+
pull_request:
10+
branches:
11+
- master
12+
13+
jobs:
14+
build:
15+
name: Build
16+
runs-on: macOS-latest
17+
strategy:
18+
matrix:
19+
platform: ['iOS Simulator,name=iPhone 8']
20+
steps:
21+
- uses: actions/checkout@v2
22+
- name: Analyze and Test
23+
run: |
24+
xcodebuild clean analyze test \
25+
-destination "platform=${{ matrix.platform }}" \
26+
-sdk "iphonesimulator" \
27+
-project PINOperation.xcodeproj \
28+
-scheme PINOperation \
29+
ONLY_ACTIVE_ARCH=NO \
30+
CODE_SIGNING_REQUIRED=NO \
31+
CLANG_ANALYZER_OUTPUT=plist-html \
32+
CLANG_ANALYZER_OUTPUT_DIR="$(pwd)/clang" \
33+
| xcpretty
34+
if [[ -n `find $(pwd)/clang -name "*.html"` ]] ; then rm -rf $(pwd)/clang; exit 1; fi
35+
rm -rf $(pwd)/clang
36+
cocoapods:
37+
name: CocoaPods
38+
runs-on: macOS-latest
39+
steps:
40+
- uses: actions/checkout@v2
41+
- name: Lint
42+
run: pod lib lint
43+
carthage:
44+
name: Carthage
45+
runs-on: macOS-latest
46+
steps:
47+
- uses: actions/checkout@v2
48+
- name: Build
49+
run: carthage build --no-skip-current
50+
spm:
51+
name: Swift Package Manager tests
52+
runs-on: macOS-latest
53+
steps:
54+
- uses: actions/checkout@v2
55+
- name: Test
56+
run: swift test
57+
example:
58+
name: Build Example project
59+
runs-on: macOS-latest
60+
strategy:
61+
matrix:
62+
platform: ['iOS Simulator,name=iPhone 8']
63+
steps:
64+
- uses: actions/checkout@v2
65+
- name: Install Pods
66+
run: cd Example && pod install
67+
- name: Build
68+
run: |
69+
cd Example && xcodebuild clean analyze \
70+
-destination "platform=${{ matrix.platform }}" \
71+
-sdk "iphonesimulator" \
72+
-workspace PINOperationExample.xcworkspace \
73+
-scheme PINOperationExample \
74+
ONLY_ACTIVE_ARCH=NO \
75+
CODE_SIGNING_REQUIRED=NO \
76+
CLANG_ANALYZER_OUTPUT=plist-html \
77+
CLANG_ANALYZER_OUTPUT_DIR="$(pwd)/clang" \
78+
| xcpretty
79+
if [[ -n `find $(pwd)/clang -name "*.html"` ]] ; then rm -rf $(pwd)/clang; exit 1; fi
80+
rm -rf $(pwd)/clang

‎Carthage/Checkouts/PINOperation/.github_changelog_generator

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
issues=false
2+
since-tag=1.1.1
3+
future-release=1.2

‎Carthage/Checkouts/PINOperation/.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,6 @@ Carthage/Build
5252
# Bundler
5353
.bundle
5454
vendor
55+
56+
# Example project
57+
Example/Pods

‎Carthage/Checkouts/PINOperation/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Carthage/Checkouts/PINOperation/BUCK

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
apple_library(
22
name = 'PINOperation',
3-
exported_headers = glob(['PINOperation/*.h']),
3+
modular = True,
4+
exported_headers = glob(['Source/*.h']),
45
srcs =
5-
glob(['PINOperation/*.m']),
6+
glob(['Source/*.m']),
67
preprocessor_flags = ['-fobjc-arc'],
78
lang_preprocessor_flags = {
89
'C': ['-std=gnu99'],

‎Carthage/Checkouts/PINOperation/CHANGELOG.md

+25-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,28 @@
1-
## master
2-
* Add your own contributions to the next release on the line below this with your name.
1+
## [1.2](https://github.com/Pinterest/PINOperation/tree/1.2) (2020-06-30)
2+
3+
[Full Changelog](https://github.com/Pinterest/PINOperation/compare/1.1.2...1.2)
4+
5+
**Merged pull requests:**
6+
7+
- Swift Package Manager support [\#32](https://github.com/pinterest/PINOperation/pull/32) ([martinpucik](https://github.com/martinpucik))
8+
- Add Carthage for watchOS, dependent by PINCache [\#31](https://github.com/pinterest/PINOperation/pull/31) ([dreampiggy](https://github.com/dreampiggy))
9+
- Fix analyzing [\#30](https://github.com/pinterest/PINOperation/pull/30) ([garrettmoon](https://github.com/garrettmoon))
10+
- Standardize our GitHub Actions CI workflow [\#29](https://github.com/pinterest/PINOperation/pull/29) ([jparise](https://github.com/jparise))
11+
- Github CI [\#26](https://github.com/pinterest/PINOperation/pull/26) ([rahul-malik](https://github.com/rahul-malik))
12+
- Fixes coalesce operation race condition [\#24](https://github.com/pinterest/PINOperation/pull/24) ([zhongwuzw](https://github.com/zhongwuzw))
13+
14+
## [1.1.2](https://github.com/Pinterest/PINOperation/tree/1.1.2) (2019-06-11)
15+
16+
[Full Changelog](https://github.com/Pinterest/PINOperation/compare/1.1.1...1.1.2)
17+
18+
**Merged pull requests:**
19+
20+
- Modernizing project [\#21](https://github.com/pinterest/PINOperation/pull/21) ([garrettmoon](https://github.com/garrettmoon))
21+
- Updates BUCK build file to match source layout. [\#20](https://github.com/pinterest/PINOperation/pull/20) ([RCacheaux](https://github.com/RCacheaux))
22+
- 1.1.1 release [\#19](https://github.com/pinterest/PINOperation/pull/19) ([garrettmoon](https://github.com/garrettmoon))
23+
24+
## 1.1.1 -- 2018 February 3
25+
* Cleanup warnings [garrett](https://github.com/garrettmoon)
326

427
## 1.1 -- 2017 October 7
528
* Deprecate addOperation: in favor of scheduleOperation: [garrett](https://github.com/garrettmoon)

‎Carthage/Checkouts/PINOperation/CI/exclude-from-build.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
[
22
"^plans/",
33
"^docs/",
4-
"^CI/exclude-from-build.json$"
4+
"^CI/exclude-from-build.json$",
5+
"^README.md$",
6+
"^CHANGELOG.md$"
57
]

‎Carthage/Checkouts/PINOperation/CODE_OF_CONDUCT.md

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Code of Conduct
2+
3+
At Pinterest, we work hard to ensure that our work environment is welcoming
4+
and inclusive to as many people as possible. We are committed to creating this
5+
environment for everyone involved in our open source projects as well. We
6+
welcome all participants regardless of ability, age, ethnicity, identified
7+
gender, religion (or lack there of), sexual orientation and socioeconomic
8+
status.
9+
10+
This code of conduct details our expectations for upholding these values.
11+
12+
## Good behavior
13+
14+
We expect members of our community to exhibit good behavior including (but of
15+
course not limited to):
16+
17+
- Using intentional and empathetic language.
18+
- Focusing on resolving instead of escalating conflict.
19+
- Providing constructive feedback.
20+
21+
## Unacceptable behavior
22+
23+
Some examples of unacceptable behavior (again, this is not an exhaustive
24+
list):
25+
26+
- Harassment, publicly or in private.
27+
- Trolling.
28+
- Sexual advances (this isn’t the place for it).
29+
- Publishing other’s personal information.
30+
- Any behavior which would be deemed unacceptable in a professional environment.
31+
32+
## Recourse
33+
34+
If you are witness to or the target of unacceptable behavior, it should be
35+
reported to Pinterest at [email protected]. All reporters will
36+
be kept confidential and an appropriate response for each incident will be
37+
evaluated.
38+
39+
If the maintainers do not uphold and enforce this code of conduct in
40+
good faith, community leadership will hold them accountable.

0 commit comments

Comments
 (0)