Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PINOperation dependency updated to 1.2.1 to support xcframework build #307

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "pinterest/PINOperation" "1.2"
github "pinterest/PINOperation" "1.2.1"
73 changes: 23 additions & 50 deletions Carthage/Checkouts/PINOperation/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,70 +11,43 @@ on:
- master

jobs:
build:
name: Build
test:
name: Test
runs-on: macOS-latest
strategy:
matrix:
platform: ['iOS Simulator,name=iPhone 8']
steps:
- uses: actions/checkout@v2
- name: Analyze and Test
run: |
xcodebuild clean analyze test \
-destination "platform=${{ matrix.platform }}" \
-sdk "iphonesimulator" \
-project PINOperation.xcodeproj \
-scheme PINOperation \
ONLY_ACTIVE_ARCH=NO \
CODE_SIGNING_REQUIRED=NO \
CLANG_ANALYZER_OUTPUT=plist-html \
CLANG_ANALYZER_OUTPUT_DIR="$(pwd)/clang" \
| xcpretty
if [[ -n `find $(pwd)/clang -name "*.html"` ]] ; then rm -rf $(pwd)/clang; exit 1; fi
rm -rf $(pwd)/clang
- name: Test
run: make test
analyze:
name: Analyze
runs-on: macOS-latest
steps:
- uses: actions/checkout@v2
- name: analyze
run: make analyze
cocoapods:
name: CocoaPods
runs-on: macOS-latest
steps:
- uses: actions/checkout@v2
- name: Lint
run: pod lib lint
- name: Cocoapods lint
run: make cocoapods
carthage:
name: Carthage
runs-on: macOS-latest
steps:
- uses: actions/checkout@v2
- name: Build
run: carthage build --no-skip-current
spm:
name: Swift Package Manager tests
runs-on: macOS-latest
- name: carthage
run: make carthage
swift-package-manager:
runs-on: macos-latest
env:
DEVELOPER_DIR: /Applications/Xcode_12.app/Contents/Developer
steps:
- uses: actions/checkout@v2
- name: Test
run: swift test
example:
name: Build Example project
runs-on: macOS-latest
strategy:
matrix:
platform: ['iOS Simulator,name=iPhone 8']
steps:
- uses: actions/checkout@v2
- name: Install Pods
run: cd Example && pod install
- name: Build
run: |
cd Example && xcodebuild clean analyze \
-destination "platform=${{ matrix.platform }}" \
-sdk "iphonesimulator" \
-workspace PINOperationExample.xcworkspace \
-scheme PINOperationExample \
ONLY_ACTIVE_ARCH=NO \
CODE_SIGNING_REQUIRED=NO \
CLANG_ANALYZER_OUTPUT=plist-html \
CLANG_ANALYZER_OUTPUT_DIR="$(pwd)/clang" \
| xcpretty
if [[ -n `find $(pwd)/clang -name "*.html"` ]] ; then rm -rf $(pwd)/clang; exit 1; fi
rm -rf $(pwd)/clang
- name: Checkout
uses: actions/checkout@v2
- name: Verify that PINCache can be build by SPM
run: make spm
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Create Release
on:
workflow_dispatch:
inputs:
release-type:
description: 'The type of release. Must be major, minor or patch'
required: true
jobs:
create_release:
runs-on: macOS-latest
steps:
- uses: actions/checkout@v2
# Make sure we can lint before creating the release.
- name: Cocoapods lint
run: make cocoapods
- name: Create Release Branch
env:
GITHUB_CHANGELOG_API_KEY: ${{ secrets.GITHUB_TOKEN }}
run: |
gem install github_changelog_generator
Scripts/release.sh --${{ github.event.inputs.release-type }}
git push origin HEAD
- name: Tag Release
run: Scripts/tag-release-branch.sh
- name: Publish Release
uses: actions/create-release@v1
env:
GITHUB_CHANGELOG_API_KEY: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ env.RELEASE_TAG }}
release_name: ${{ env.RELEASE_TAG }}
body_path: RELEASE_NOTES.md
draft: false
- name: Push to Cocoapods
env:
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
run: pod trunk push
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Create Release
on:
workflow_dispatch:
inputs:
release-type:
description: 'The type of release. Must be major, minor or patch'
required: true
jobs:
create_release:
runs-on: macOS-latest
steps:
- uses: actions/checkout@v2
# Make sure we can lint before creating the release.
- name: Cocoapods lint
run: make cocoapods
- name: Create Release Branch
env:
GITHUB_CHANGELOG_API_KEY: ${{ secrets.GITHUB_TOKEN }}
run: |
gem install github_changelog_generator
Scripts/release.sh --${{ github.event.inputs.release-type }}
git push origin HEAD
- name: Tag Release
run: Scripts/tag-release-branch.sh
- name: Publish Release
uses: actions/create-release@v1
env:
GITHUB_CHANGELOG_API_KEY: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ env.RELEASE_TAG }}
release_name: ${{ env.RELEASE_TAG }}
body_path: RELEASE_NOTES.md
draft: false
- name: Push to Cocoapods
env:
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
run: pod trunk push
4 changes: 2 additions & 2 deletions Carthage/Checkouts/PINOperation/.github_changelog_generator
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
issues=false
since-tag=1.1.1
future-release=1.2
since-tag=1.2
future-release=1.2.1

This file was deleted.

22 changes: 0 additions & 22 deletions Carthage/Checkouts/PINOperation/BUCK

This file was deleted.

12 changes: 12 additions & 0 deletions Carthage/Checkouts/PINOperation/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
# Changelog

## [1.2.1](https://github.com/Pinterest/PINOperation/tree/1.2.1) (2020-10-22)

[Full Changelog](https://github.com/Pinterest/PINOperation/compare/1.2...1.2.1)


- Add release script [\#38](https://github.com/pinterest/PINOperation/pull/38) ([garrettmoon](https://github.com/garrettmoon))
- Only use @import for SPM [\#36](https://github.com/pinterest/PINOperation/pull/36) ([garrettmoon](https://github.com/garrettmoon))
- Add SPM Test [\#35](https://github.com/pinterest/PINOperation/pull/35) ([garrettmoon](https://github.com/garrettmoon))
- Remove BUCK target [\#34](https://github.com/pinterest/PINOperation/pull/34) ([adlerj](https://github.com/adlerj))

## [1.2](https://github.com/Pinterest/PINOperation/tree/1.2) (2020-06-30)

[Full Changelog](https://github.com/Pinterest/PINOperation/compare/1.1.2...1.2)
Expand Down
23 changes: 0 additions & 23 deletions Carthage/Checkouts/PINOperation/Dangerfile

This file was deleted.

4 changes: 0 additions & 4 deletions Carthage/Checkouts/PINOperation/Gemfile

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
PLATFORM="platform=iOS Simulator,name=iPhone 7"
PLATFORM="platform=iOS Simulator,name=iPhone 8"
SDK="iphonesimulator"
SHELL=/bin/bash -o pipefail

.PHONY: all lint test analyze carthage
.PHONY: all cocoapods test analyze carthage spm

carthage:
carthage build --no-skip-current

lint:
cocoapods:
pod lib lint

analyze:
Expand All @@ -24,4 +24,10 @@ test:
ONLY_ACTIVE_ARCH=NO \
CODE_SIGNING_REQUIRED=NO | xcpretty

all: carthage lint test analyze
spm:
# For now just check whether we can assemble it
# TODO: replace it with "swift test --enable-test-discovery --sanitize=thread" when swiftPM resource-related bug would be fixed.
# https://bugs.swift.org/browse/SR-13560
swift build

all: carthage cocoapods test analyze spm
2 changes: 1 addition & 1 deletion Carthage/Checkouts/PINOperation/PINOperation.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'PINOperation'
s.version = '1.2'
s.version = '1.2.1'
s.homepage = 'https://github.com/pinterest/PINOperation'
s.summary = 'Fast, concurrency-limited task queue for iOS and OS X.'
s.authors = { 'Garrett Moon' => 'garrett@pinterest.com' }
Expand Down
12 changes: 3 additions & 9 deletions Carthage/Checkouts/PINOperation/RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
# Release Process
This document describes the process for a public PINOperation release.

### Preparation
- Install [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator): `sudo gem install github_changelog_generator`
- Generate a GitHub Personal Access Token to prevent running into public GitHub API rate limits: https://github.com/github-changelog-generator/github-changelog-generator#github-token

### Process
- Run `github_changelog_generator` in PINOperation project directory: `github_changelog_generator --token <generated personal token> --user Pinterest --project PINOperation`. To avoid hitting rate limit, the generator will replace the entire file with just the changes from this version – revert that giant deletion to get the entire new changelog.
- Update `spec.version` within `PINOperation.podspec` and the `since-tag` and `future-release` fields in `.github_changelog_generator`.
- Create a new PR with the updated `PINOperation.podspec` and the newly generated changelog, add `#changelog` to the PR message so the CI will not prevent merging it.
- After merging in the PR, [create a new GitHub release](https://github.com/Pinterest/PINOperation/releases/new). Use the generated changelog for the new release.
- Push to Cocoapods with `pod trunk push`
- Ensure the latest master build is green.
- Run the github action 'Create Release'.
- Check that the release was successfully published to [Github](https://github.com/pinterest/PINOperation/releases) and [Cocoapods](https://cocoapods.org/pods/PINOperation).
Loading