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

Bumped minor version for release #163

Merged
merged 33 commits into from
Oct 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
52e767f
Bumped minor version for release
mjohnson12 Oct 27, 2022
99850e3
Attempt to use Ruby 2.7.6 to fix build issue
mjohnson12 Oct 27, 2022
49591d2
Updated Xcode to 13.3.1
mjohnson12 Oct 27, 2022
819028f
Changed simulator to iOS 15.4
mjohnson12 Oct 27, 2022
23bf2d2
Attempt to install xcpretty
mjohnson12 Oct 27, 2022
66e512e
Updated Gemfile.lock
mjohnson12 Oct 27, 2022
d12c75a
Attempt to fix xcpretty
mjohnson12 Oct 27, 2022
aba7b37
xcpretty attempt 2
mjohnson12 Oct 27, 2022
d01cda9
3rd time is a charm
mjohnson12 Oct 27, 2022
a225a15
See if hard coding path works
mjohnson12 Oct 27, 2022
e1c0aaf
Remove hard coded path
mjohnson12 Oct 27, 2022
4f30637
turn of bundle cache from setup-ruby
mjohnson12 Oct 27, 2022
06d2a42
fix missing cache and bundle step
mjohnson12 Oct 27, 2022
8e09194
try using built in xcpretty
mjohnson12 Oct 27, 2022
2ee4217
Try local installed xcpretty gem
mjohnson12 Oct 27, 2022
9d04b30
try ~
mjohnson12 Oct 27, 2022
1359ee2
attempt to uninstall default xcpretty
mjohnson12 Oct 28, 2022
d06c4b2
try gem uninstall
mjohnson12 Oct 28, 2022
528fffa
try uninstalling rouge dependency
mjohnson12 Oct 28, 2022
7959100
try cleanup
mjohnson12 Oct 28, 2022
c45dcde
see what’s in .bundle
mjohnson12 Oct 28, 2022
de628b4
see whats in .bundle/ruby
mjohnson12 Oct 28, 2022
955398f
see what’s in .bundle/ruby/2.7.0
mjohnson12 Oct 28, 2022
7803286
see what’s in gems
mjohnson12 Oct 28, 2022
1a97853
see what’s in xcpretty
mjohnson12 Oct 28, 2022
3a87018
trying path to xcpretty
mjohnson12 Oct 28, 2022
dffe8d8
Attempt to fix tutorial build
mjohnson12 Oct 28, 2022
705ccdc
relative path to xcpretty
mjohnson12 Oct 28, 2022
9180d78
Try to get cocoapods gems to install with Ruby 3
mjohnson12 Oct 28, 2022
b717bfa
remove addtion ruby 2.7.6 step
mjohnson12 Oct 28, 2022
1fe0ee8
remove xcpretty from gemfile
mjohnson12 Oct 28, 2022
768df35
Added comment to gemfile
mjohnson12 Oct 28, 2022
23d3a05
Try cache v3
mjohnson12 Oct 28, 2022
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
24 changes: 12 additions & 12 deletions .github/workflows/swift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
- Development-Unit-WorkflowRxSwiftTestingTests

steps:
- uses: actions/checkout@v1

- uses: actions/checkout@v3
- name: Cache gems
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: .bundle
key: gems-${{ hashFiles('Gemfile.lock') }}
Expand All @@ -41,17 +41,17 @@ jobs:
bundle exec pod gen Development.podspec

- name: Switch Xcode
run: sudo xcode-select -s /Applications/Xcode_12.5.1.app
run: sudo xcode-select -s /Applications/Xcode_13.3.1.app

- name: Build & Test
run: |
set -o pipefail && xcodebuild -workspace gen/Development/Development.xcworkspace -scheme ${{ matrix.scheme }} -destination platform\=iOS\ Simulator,OS\=14.5,name\=iPad\ Pro\ \(9.7-inch\) build test | xcpretty
set -o pipefail && xcodebuild -workspace gen/Development/Development.xcworkspace -scheme ${{ matrix.scheme }} -destination platform\=iOS\ Simulator,OS\=15.4,name\=iPad\ Pro\ \(9.7-inch\) build test | xcpretty

spm:
runs-on: macos-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3

- name: Swift Package Manager - iOS
run: |
Expand All @@ -65,10 +65,10 @@ jobs:
runs-on: macos-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3

- name: Cache gems
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: .bundle
key: gems-${{ hashFiles('Gemfile.lock') }}
Expand All @@ -78,22 +78,22 @@ jobs:
bundle check || bundle install --path .bundle

- name: Switch Xcode
run: sudo xcode-select -s /Applications/Xcode_12.5.1.app
run: sudo xcode-select -s /Applications/Xcode_13.3.1.app

- name: Tutorial App
run: |
cd Samples/Tutorial
bundle exec pod install
set -o pipefail && xcodebuild -workspace Tutorial.xcworkspace -scheme Tutorial -destination platform\=iOS\ Simulator,OS\=14.5,name\=iPad\ Pro\ \(9.7-inch\) build test | xcpretty
set -o pipefail && xcodebuild -workspace Tutorial.xcworkspace -scheme Tutorial -destination platform\=iOS\ Simulator,OS\=15.4,name\=iPad\ Pro\ \(9.7-inch\) build test | xcpretty

documentation-lint:
runs-on: macos-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3

- name: Cache gems
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: .bundle
key: gems-${{ hashFiles('Gemfile.lock') }}
Expand Down
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ source 'https://rubygems.org'
gem 'cocoapods-trunk', '>=1.6.0'
gem 'cocoapods'

# Need it for Ruby 3.0 support and no release has happened yet
gem 'cocoapods-disable-podfile-validations', :git => 'https://github.com/segiddins/cocoapods-disable-podfile-validations.git', :ref => '55598d677fa995be496a47b810f4f9dce732b169'
gem 'cocoapods-generate'
9 changes: 8 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
GIT
remote: https://github.com/segiddins/cocoapods-disable-podfile-validations.git
revision: 55598d677fa995be496a47b810f4f9dce732b169
ref: 55598d677fa995be496a47b810f4f9dce732b169
specs:
cocoapods-disable-podfile-validations (0.1.1)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -45,7 +52,6 @@ GEM
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-disable-podfile-validations (0.1.1)
cocoapods-downloader (1.6.3)
cocoapods-generate (2.2.2)
cocoapods-disable-podfile-validations (~> 0.1.1)
Expand Down Expand Up @@ -95,6 +101,7 @@ PLATFORMS

DEPENDENCIES
cocoapods
cocoapods-disable-podfile-validations!
cocoapods-generate
cocoapods-trunk (>= 1.6.0)

Expand Down
1 change: 1 addition & 0 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ For Squares, membership is managed through the `Workflow Swift Owners` registry
bundle exec pod trunk push WorkflowCombine.podspec --synchronous
bundle exec pod trunk push WorkflowCombineTesting.podspec --synchronous
bundle exec pod trunk push WorkflowConcurrency.podspec --synchronous
bundle exec pod trunk push WorkflowConcurrencyTesting.podspec --synchronous
```

1. [Square specific] To make the new version available internally, update the [CocoaPods spec repo](https://go/cocoapod-specs).
4 changes: 2 additions & 2 deletions VERSION
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MAJOR=1
MINOR=0
PATCH=6
MINOR=1
PATCH=0
PRE_RELEASE_IDENTIFIER=''