Skip to content

Commit

Permalink
Testing build after gem changes
Browse files Browse the repository at this point in the history 
Signed-off-by: Ali Karbassi <[email protected]>
  • Loading branch information
@karbassi
karbassi committed Sep 15, 2021
1 parent 3c5ab71 commit c6b2046
Show file tree
Hide file tree
Showing 5 changed files with 93 additions and 65 deletions.
44 changes: 27 additions & 17 deletions .github/workflows/test_only.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ jobs:
runs-on: macOS-latest

steps:
- uses: actions/checkout@master
- uses: actions/checkout@v2
with:
submodules: true

# - uses: actions/cache@v1
# with:
Expand All @@ -23,16 +25,24 @@ jobs:
# restore-keys: |
# ${{ runner.os }}-pods-

- name: Install gems
run: |
bundle config path vendor/bundle
# bundle config set without 'default doc job cable storage ujs test db'
bundle install --jobs 4 --retry 3
# - name: Install gems
# run: |
# bundle config path vendor/bundle
# # bundle config set without 'default doc job cable storage ujs test db'
# bundle install --jobs 4 --retry 3

# - name: Install Dependences
# run: |
# bundle exec pod update
# bundle exec pod install

- name: Install Dependences
run: |
bundle exec pod update --verbose
bundle exec pod install --verbose
sudo gem install cocoapods
pod install
- name: Clean and Build
run: xcodebuild CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -scheme "SelfControl" -target "SelfControl" -configuration Release clean build

# - name: Build
# uses: sersoft-gmbh/[email protected]
Expand All @@ -42,12 +52,12 @@ jobs:
# destination: platform=macOS
# action: build

# https://github.com/mxcl/xcodebuild
- name: Build
uses: mxcl/xcodebuild@v1
with:
xcode: ^12
platform: macOS
action: build
code-coverage: false
configuration: release
# # https://github.com/mxcl/xcodebuild
# - name: Build
# uses: mxcl/xcodebuild@v1
# with:
# xcode: ^12
# platform: macOS
# action: build
# code-coverage: false
# configuration: release
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source 'https://rubygems.org'

gem "cocoapods-binary-cache", :git => "https://github.com/grab/cocoapods-binary-cache.git", :tag => "0.1.11"
gem "cocoapods-binary-cache", :git => "https://github.com/grab/cocoapods-binary-cache.git", :tag => "0.1.14"
gem 'cocoapods-prune-localizations'
59 changes: 31 additions & 28 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,36 @@
GIT
remote: https://github.com/grab/cocoapods-binary-cache.git
revision: 1d8b6c34ea8617c2e401264d824415bafdd84152
tag: 0.1.11
revision: f73781c33d07c85971609449163b6f29a759971f
tag: 0.1.14
specs:
cocoapods-binary-cache (0.1.11)
cocoapods-binary-cache (0.1.14)
cocoapods (>= 1.5.0)
fourflusher (~> 2.0)
parallel (~> 1.0)
rgl (~> 0.5.6)
xcpretty (~> 0.3.0)

GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.3)
activesupport (5.2.6)
activesupport (6.1.4.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
claide (1.0.3)
cocoapods (1.10.1)
addressable (~> 2.6)
cocoapods (1.11.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.10.1)
cocoapods-core (= 1.11.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -39,27 +41,27 @@ GEM
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.6.6)
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.19.0, < 2.0)
cocoapods-core (1.10.1)
activesupport (> 5.0, < 6)
addressable (~> 2.6)
ruby-macho (>= 1.0, < 3.0)
xcodeproj (>= 1.21.0, < 2.0)
cocoapods-core (1.11.2)
activesupport (>= 5.0, < 7)
addressable (~> 2.8)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
public_suffix
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.4.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (1.5.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-prune-localizations (0.3.1)
cocoapods-search (1.0.0)
cocoapods-trunk (1.5.0)
cocoapods-search (1.0.1)
cocoapods-trunk (1.6.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
Expand All @@ -68,7 +70,7 @@ GEM
escape (0.0.4)
ethon (0.14.0)
ffi (>= 1.15.0)
ffi (1.15.3)
ffi (1.15.4)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
generator (0.0.1)
Expand All @@ -79,25 +81,25 @@ GEM
json (2.5.1)
lazy_priority_queue (0.1.1)
minitest (5.14.4)
molinillo (0.6.6)
molinillo (0.8.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
parallel (1.21.0)
public_suffix (4.0.6)
rexml (3.2.5)
rgl (0.5.7)
lazy_priority_queue (~> 0.1.0)
stream (~> 0.5.3)
rouge (2.0.7)
ruby-macho (1.4.0)
ruby-macho (2.5.1)
stream (0.5.3)
generator
thread_safe (0.3.6)
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.9)
thread_safe (~> 0.1)
xcodeproj (1.20.0)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
xcodeproj (1.21.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand All @@ -106,6 +108,7 @@ GEM
rexml (~> 3.2.4)
xcpretty (0.3.0)
rouge (~> 2.0.7)
zeitwerk (2.4.2)

PLATFORMS
x86_64-darwin-20
Expand Down
10 changes: 5 additions & 5 deletions Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ target "SelfControl" do
pod 'TransformerKit', '~> 1.1.1'
pod 'FormatterKit/TimeIntervalFormatter', '~> 1.8.0'
pod 'LetsMove', '~> 1.24'
pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.0.3'
pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.2.10'

# Add test target
target 'SelfControlTests' do
Expand All @@ -24,19 +24,19 @@ end

target "SelfControl Killer" do
use_frameworks! :linkage => :static
pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.0.3'
pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.2.10'
end

# we can't use_frameworks on these because they're command-line tools
# Sentry says we need use_frameworks, but they seem to work OK anyway?
target "SCKillerHelper" do
pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.0.3'
pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.2.10'
end
target "selfcontrol-cli" do
pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.0.3'
pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.2.10'
end
target "org.eyebeam.selfcontrold" do
pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.0.3'
pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.2.10'
end

post_install do |pi|
Expand Down
43 changes: 29 additions & 14 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,43 @@
[SelfControl](http://selfcontrolapp.com)
===========
# [SelfControl](http://selfcontrolapp.com)

About
-----
SelfControl is a free and open-source application for macOS that lets you block <strong>your own</strong> access to distracting websites, your mail servers, or anything else on the Internet. Just set a period of time to block for, add sites to your blocklist, and click "Start." Until that timer expires, you will be unable to access those sites—even if you restart your computer or delete the application.
## About

SelfControl is a free and open-source application for macOS that lets you block **your own** access to distracting websites, your mail servers, or anything else on the Internet. Just set a period of time to block for, add sites to your blocklist, and click "Start." Until that timer expires, you will be unable to access those sites—even if you restart your computer or delete the application.

## Credits

Credits
-------
Developed by [Charlie Stigler](http://charliestigler.com), [Steve Lambert](http://visitsteve.com), and [others](https://github.com/SelfControlApp/selfcontrol/graphs/contributors). Your contributions very welcome!

SelfControl is now available in 12 languages thanks to [the fine translators credited here](https://github.com/SelfControlApp/selfcontrol/wiki/Translation-Credits).

License
-------
SelfControl is free software under the GPL. See [this file](https://github.com/SelfControlApp/selfcontrol/blob/master/COPYING) for more details.
## License

SelfControl is free software under the GPL. See [this file](COPYING) for more details.

Building For Development
--------------------
## Building For Development

Users should always download the latest version of SelfControl from [our website]. If you want to contribute to SelfControl, you'll need to learn to build it for development. This can only be done on a Mac running a modern version of macOS.

1. Clone the SelfControl repo from GitHub.

```sh
git clone --recurse-submodules -j8 https://github.com/SelfControlApp/selfcontrol.git
```

2. Make sure you have a recent version of Xcode and the Xcode command-line tools installed.
3. Install [CocoaPods](https://cocoapods.org/): `sudo gem install cocoapods`
4. Install the SelfControl dependencies using CocoaPods: `pod install`

3. Install [CocoaPods](https://cocoapods.org/)

```sh
sudo gem install cocoapods
```

4. Install the SelfControl dependencies using CocoaPods

```sh
pod install
```

5. Open the `selfcontrol.xcworkspace` file (NOT `selfcontrol.xcodeproj`)

6. Build and run (you may need to update/remove code signing settings to make it build properly)

0 comments on commit c6b2046

Please sign in to comment.