From 3c5ab716f1ed5b8026b0da85075e99b5524741cf Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Fri, 23 Jul 2021 13:27:10 -0500 Subject: [PATCH 01/19] Github Actions --- .github/workflows/test_only.yml | 53 ++++++++++++ Gemfile | 4 + Gemfile.lock | 118 ++++++++++++++++++++++++++ Podfile | 4 +- SelfControl.xcodeproj/project.pbxproj | 25 +----- 5 files changed, 178 insertions(+), 26 deletions(-) create mode 100644 .github/workflows/test_only.yml create mode 100644 Gemfile create mode 100644 Gemfile.lock diff --git a/.github/workflows/test_only.yml b/.github/workflows/test_only.yml new file mode 100644 index 00000000..19edb3ca --- /dev/null +++ b/.github/workflows/test_only.yml @@ -0,0 +1,53 @@ +name: Test Only + +on: [push] + +jobs: + build: + runs-on: macOS-latest + + steps: + - uses: actions/checkout@master + + # - uses: actions/cache@v1 + # with: + # path: vendor/bundle + # key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }} + # restore-keys: | + # ${{ runner.os }}-gem- + + # - uses: actions/cache@v1 + # with: + # path: Pods + # key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }} + # 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 Dependences + run: | + bundle exec pod update --verbose + bundle exec pod install --verbose + + # - name: Build + # uses: sersoft-gmbh/xcodebuild-action@v1.4 + # with: + # project: SelfControl.xcodeproj + # scheme: SelfControl + # 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 diff --git a/Gemfile b/Gemfile new file mode 100644 index 00000000..94861aab --- /dev/null +++ b/Gemfile @@ -0,0 +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-prune-localizations' diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000..1fd4b468 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,118 @@ +GIT + remote: https://github.com/grab/cocoapods-binary-cache.git + revision: 1d8b6c34ea8617c2e401264d824415bafdd84152 + tag: 0.1.11 + specs: + cocoapods-binary-cache (0.1.11) + cocoapods (>= 1.5.0) + fourflusher (~> 2.0) + rgl (~> 0.5.6) + xcpretty (~> 0.3.0) + +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.3) + activesupport (5.2.6) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + 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) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.10.1) + cocoapods-deintegrate (>= 1.0.3, < 2.0) + cocoapods-downloader (>= 1.4.0, < 2.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.4.0, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) + colored2 (~> 3.1) + escape (~> 0.0.4) + fourflusher (>= 2.3.0, < 3.0) + gh_inspector (~> 1.0) + molinillo (~> 0.6.6) + 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) + algoliasearch (~> 1.0) + concurrent-ruby (~> 1.1) + fuzzy_match (~> 2.0.4) + nap (~> 1.0) + netrc (~> 0.11) + public_suffix + typhoeus (~> 1.0) + cocoapods-deintegrate (1.0.4) + cocoapods-downloader (1.4.0) + cocoapods-plugins (1.0.0) + nap + cocoapods-prune-localizations (0.3.1) + cocoapods-search (1.0.0) + cocoapods-trunk (1.5.0) + nap (>= 0.8, < 2.0) + netrc (~> 0.11) + cocoapods-try (1.2.0) + colored2 (3.1.2) + concurrent-ruby (1.1.9) + escape (0.0.4) + ethon (0.14.0) + ffi (>= 1.15.0) + ffi (1.15.3) + fourflusher (2.3.1) + fuzzy_match (2.0.4) + generator (0.0.1) + gh_inspector (1.1.3) + httpclient (2.8.3) + i18n (1.8.10) + concurrent-ruby (~> 1.0) + json (2.5.1) + lazy_priority_queue (0.1.1) + minitest (5.14.4) + molinillo (0.6.6) + nanaimo (0.3.0) + nap (1.1.0) + netrc (0.11.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) + 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) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.3.0) + rexml (~> 3.2.4) + xcpretty (0.3.0) + rouge (~> 2.0.7) + +PLATFORMS + x86_64-darwin-20 + +DEPENDENCIES + cocoapods-binary-cache! + cocoapods-prune-localizations + +BUNDLED WITH + 2.2.22 diff --git a/Podfile b/Podfile index bccb1be6..df9ddd0c 100644 --- a/Podfile +++ b/Podfile @@ -1,4 +1,4 @@ -source 'https://github.com/CocoaPods/Specs.git' +source 'https://cdn.cocoapods.org/' minVersion = '10.10' @@ -15,7 +15,7 @@ target "SelfControl" do pod 'FormatterKit/TimeIntervalFormatter', '~> 1.8.0' pod 'LetsMove', '~> 1.24' pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.0.3' - + # Add test target target 'SelfControlTests' do inherit! :complete diff --git a/SelfControl.xcodeproj/project.pbxproj b/SelfControl.xcodeproj/project.pbxproj index dd3dcdc4..7b4ee87f 100644 --- a/SelfControl.xcodeproj/project.pbxproj +++ b/SelfControl.xcodeproj/project.pbxproj @@ -3028,7 +3028,6 @@ LastUpgradeCheck = 0930; TargetAttributes = { 8D1107260486CEB800E47090 = { - DevelopmentTeam = L6W5L88KN7; LastSwiftMigration = 1150; ProvisioningStyle = Manual; SystemCapabilities = { @@ -3039,25 +3038,20 @@ }; CB0EEF5C20FD8CE00024D27B = { CreatedOnToolsVersion = 9.4.1; - DevelopmentTeam = L6W5L88KN7; ProvisioningStyle = Automatic; }; CB74D1052480E506002B2079 = { - DevelopmentTeam = L6W5L88KN7; ProvisioningStyle = Manual; }; CB9C80F619CFB79700CDCAE1 = { CreatedOnToolsVersion = 6.0.1; - DevelopmentTeam = L6W5L88KN7; ProvisioningStyle = Automatic; }; CB9C811A19CFBA8500CDCAE1 = { CreatedOnToolsVersion = 6.0.1; - DevelopmentTeam = L6W5L88KN7; ProvisioningStyle = Manual; }; CBA2AFD10F39EC12005AFEBE = { - DevelopmentTeam = L6W5L88KN7; ProvisioningStyle = Manual; }; }; @@ -4056,12 +4050,10 @@ buildSettings = { CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - CODE_SIGN_IDENTITY = "Developer ID Application"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 406; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = L6W5L88KN7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)", @@ -4093,7 +4085,6 @@ COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 406; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = L6W5L88KN7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)", @@ -4140,7 +4131,6 @@ CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = L6W5L88KN7; ENABLE_HARDENED_RUNTIME = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -4190,7 +4180,6 @@ CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = L6W5L88KN7; ENABLE_HARDENED_RUNTIME = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; @@ -4283,12 +4272,10 @@ buildSettings = { CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - CODE_SIGN_IDENTITY = "Developer ID Application"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 406; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = L6W5L88KN7; GCC_DYNAMIC_NO_PIC = NO; GCC_MODEL_TUNING = G5; GCC_NO_COMMON_BLOCKS = NO; @@ -4326,12 +4313,10 @@ buildSettings = { CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - CODE_SIGN_IDENTITY = "Developer ID Application"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 406; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = L6W5L88KN7; GCC_MODEL_TUNING = G5; GCC_NO_COMMON_BLOCKS = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -4382,7 +4367,6 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 406; - DEVELOPMENT_TEAM = ""; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; @@ -4428,7 +4412,6 @@ COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = 406; - DEVELOPMENT_TEAM = L6W5L88KN7; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -4464,8 +4447,6 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "Developer ID Application"; - DEVELOPMENT_TEAM = L6W5L88KN7; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; @@ -4509,7 +4490,6 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; - DEVELOPMENT_TEAM = L6W5L88KN7; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -4534,12 +4514,10 @@ buildSettings = { CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; - CODE_SIGN_IDENTITY = "Developer ID Application"; COPY_PHASE_STRIP = NO; CREATE_INFOPLIST_SECTION_IN_BINARY = YES; CURRENT_PROJECT_VERSION = 406; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = L6W5L88KN7; FRAMEWORK_SEARCH_PATHS = ( "$(PLATFORM_DIR)/Developer/Library/Frameworks\n\n$(PLATFORM_DIR)/Developer/Library/Frameworks\n\n", ); @@ -4574,7 +4552,6 @@ CREATE_INFOPLIST_SECTION_IN_BINARY = YES; CURRENT_PROJECT_VERSION = 406; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = L6W5L88KN7; FRAMEWORK_SEARCH_PATHS = ( "$(PLATFORM_DIR)/Developer/Library/Frameworks\n\n$(PLATFORM_DIR)/Developer/Library/Frameworks\n\n", ); From c6b2046ef0163a455929657243e579ea02731744 Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Wed, 15 Sep 2021 10:04:02 -0500 Subject: [PATCH 02/19] Testing build after gem changes Signed-off-by: Ali Karbassi --- .github/workflows/test_only.yml | 44 ++++++++++++++---------- Gemfile | 2 +- Gemfile.lock | 59 +++++++++++++++++---------------- Podfile | 10 +++--- README.md | 43 ++++++++++++++++-------- 5 files changed, 93 insertions(+), 65 deletions(-) diff --git a/.github/workflows/test_only.yml b/.github/workflows/test_only.yml index 19edb3ca..e3919a8b 100644 --- a/.github/workflows/test_only.yml +++ b/.github/workflows/test_only.yml @@ -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: @@ -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/xcodebuild-action@v1.4 @@ -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 diff --git a/Gemfile b/Gemfile index 94861aab..1e9c2174 100644 --- a/Gemfile +++ b/Gemfile @@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index 1fd4b468..69d5790d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,11 +1,12 @@ 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) @@ -13,11 +14,12 @@ 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) @@ -25,10 +27,10 @@ GEM 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) @@ -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) @@ -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) @@ -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) @@ -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 diff --git a/Podfile b/Podfile index df9ddd0c..383ef68e 100644 --- a/Podfile +++ b/Podfile @@ -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 @@ -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| diff --git a/README.md b/README.md index d524ae04..6acb4f3d 100755 --- a/README.md +++ b/README.md @@ -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 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. +## 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) From b4f00f04cb25630808d5fa60ce704c385abf854d Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Wed, 15 Sep 2021 10:05:49 -0500 Subject: [PATCH 03/19] adding cocoapods-prune-localizations --- .github/workflows/test_only.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_only.yml b/.github/workflows/test_only.yml index e3919a8b..5c674d61 100644 --- a/.github/workflows/test_only.yml +++ b/.github/workflows/test_only.yml @@ -38,7 +38,7 @@ jobs: - name: Install Dependences run: | - sudo gem install cocoapods + sudo gem install cocoapods cocoapods-prune-localizations pod install - name: Clean and Build From 527c69549b45f031607ec1ff98862f623f51e0b4 Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Wed, 15 Sep 2021 10:10:17 -0500 Subject: [PATCH 04/19] Adding pod setup and update --- .github/workflows/test_only.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test_only.yml b/.github/workflows/test_only.yml index 5c674d61..00f5abc7 100644 --- a/.github/workflows/test_only.yml +++ b/.github/workflows/test_only.yml @@ -39,6 +39,8 @@ jobs: - name: Install Dependences run: | sudo gem install cocoapods cocoapods-prune-localizations + pod setup + pod update pod install - name: Clean and Build From 59e099faac8f3a087dc4c91f38331f4373091123 Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Wed, 15 Sep 2021 10:54:30 -0500 Subject: [PATCH 05/19] Upgrade Sentry version --- Podfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Podfile b/Podfile index 383ef68e..7b1135d0 100644 --- a/Podfile +++ b/Podfile @@ -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.2.10' + pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.3.0' # Add test target target 'SelfControlTests' do @@ -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.2.10' + pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.3.0' 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.2.10' + pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.3.0' end target "selfcontrol-cli" do - pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.2.10' + pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.3.0' end target "org.eyebeam.selfcontrold" do - pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.2.10' + pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.3.0' end post_install do |pi| From b991d10792697afaf0609d251ede160ac0388fc8 Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Wed, 15 Sep 2021 11:15:17 -0500 Subject: [PATCH 06/19] Add workspace --- .github/workflows/test_only.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_only.yml b/.github/workflows/test_only.yml index 00f5abc7..f0c72d2d 100644 --- a/.github/workflows/test_only.yml +++ b/.github/workflows/test_only.yml @@ -44,7 +44,15 @@ jobs: pod install - name: Clean and Build - run: xcodebuild CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -scheme "SelfControl" -target "SelfControl" -configuration Release clean build + run: | + xcodebuild \ + CODE_SIGN_IDENTITY="" \ + CODE_SIGNING_REQUIRED=NO \ + -workspace SelfControl.xcworkspace \ + -scheme "SelfControl" \ + -target "SelfControl" \ + -configuration Release \ + clean build # - name: Build # uses: sersoft-gmbh/xcodebuild-action@v1.4 From 34d65177532b98d56a1fbc5b949ddab3c8b31862 Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Wed, 15 Sep 2021 11:16:52 -0500 Subject: [PATCH 07/19] Removing target --- .github/workflows/test_only.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test_only.yml b/.github/workflows/test_only.yml index f0c72d2d..78494961 100644 --- a/.github/workflows/test_only.yml +++ b/.github/workflows/test_only.yml @@ -50,7 +50,6 @@ jobs: CODE_SIGNING_REQUIRED=NO \ -workspace SelfControl.xcworkspace \ -scheme "SelfControl" \ - -target "SelfControl" \ -configuration Release \ clean build From e7f08289f051cd9307f606515c66c98926fe1e91 Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Wed, 15 Sep 2021 11:22:20 -0500 Subject: [PATCH 08/19] Submodules --- .github/workflows/test_only.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_only.yml b/.github/workflows/test_only.yml index 78494961..785e8609 100644 --- a/.github/workflows/test_only.yml +++ b/.github/workflows/test_only.yml @@ -9,7 +9,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - submodules: true + submodules: recursive # - uses: actions/cache@v1 # with: From 3e74f3ec17a566322986b6ed8f8d4a6b802b2044 Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Wed, 15 Sep 2021 11:38:47 -0500 Subject: [PATCH 09/19] Trying bundle route --- .github/workflows/test_only.yml | 42 +++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/.github/workflows/test_only.yml b/.github/workflows/test_only.yml index 785e8609..b31045ca 100644 --- a/.github/workflows/test_only.yml +++ b/.github/workflows/test_only.yml @@ -25,27 +25,21 @@ 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 Dependences - # run: | - # bundle exec pod update - # bundle exec pod install + - 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: | - sudo gem install cocoapods cocoapods-prune-localizations - pod setup - pod update - pod install + bundle exec pod setup + bundle exec pod update + bundle exec pod install - name: Clean and Build run: | - xcodebuild \ + bundle exec xcodebuild \ CODE_SIGN_IDENTITY="" \ CODE_SIGNING_REQUIRED=NO \ -workspace SelfControl.xcworkspace \ @@ -53,6 +47,24 @@ jobs: -configuration Release \ clean build + # v2 + # - name: Install Dependences + # run: | + # sudo gem install cocoapods cocoapods-prune-localizations + # pod setup + # pod update + # pod install + + # - name: Clean and Build + # run: | + # xcodebuild \ + # CODE_SIGN_IDENTITY="" \ + # CODE_SIGNING_REQUIRED=NO \ + # -workspace SelfControl.xcworkspace \ + # -scheme "SelfControl" \ + # -configuration Release \ + # clean build + # - name: Build # uses: sersoft-gmbh/xcodebuild-action@v1.4 # with: From 13b504510c40d42d51024e409459e26c4d1aa452 Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Wed, 15 Sep 2021 11:39:47 -0500 Subject: [PATCH 10/19] Trying bundle route --- .github/workflows/test_only.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test_only.yml b/.github/workflows/test_only.yml index b31045ca..4d40fe64 100644 --- a/.github/workflows/test_only.yml +++ b/.github/workflows/test_only.yml @@ -33,7 +33,6 @@ jobs: - name: Install Dependences run: | - bundle exec pod setup bundle exec pod update bundle exec pod install From b08a7e1f75b927057d1d43d8b9eaaec9b6c1435d Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Wed, 15 Sep 2021 11:41:31 -0500 Subject: [PATCH 11/19] Bundle route --- .github/workflows/test_only.yml | 4 +- Gemfile.lock | 121 -------------------------------- 2 files changed, 2 insertions(+), 123 deletions(-) delete mode 100644 Gemfile.lock diff --git a/.github/workflows/test_only.yml b/.github/workflows/test_only.yml index 4d40fe64..e3aee4c5 100644 --- a/.github/workflows/test_only.yml +++ b/.github/workflows/test_only.yml @@ -27,8 +27,8 @@ jobs: - name: Install gems run: | - bundle config path vendor/bundle - bundle config set without 'default doc job cable storage ujs test db' + # 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 diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 69d5790d..00000000 --- a/Gemfile.lock +++ /dev/null @@ -1,121 +0,0 @@ -GIT - remote: https://github.com/grab/cocoapods-binary-cache.git - revision: f73781c33d07c85971609449163b6f29a759971f - tag: 0.1.14 - specs: - 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 (6.1.4.1) - concurrent-ruby (~> 1.0, >= 1.0.2) - 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.11.2) - addressable (~> 2.8) - claide (>= 1.0.2, < 2.0) - 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) - cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.4.0, < 2.0) - cocoapods-try (>= 1.1.0, < 2.0) - colored2 (~> 3.1) - escape (~> 0.0.4) - fourflusher (>= 2.3.0, < 3.0) - gh_inspector (~> 1.0) - molinillo (~> 0.8.0) - nap (~> 1.0) - 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 (~> 4.0) - typhoeus (~> 1.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.1) - cocoapods-trunk (1.6.0) - nap (>= 0.8, < 2.0) - netrc (~> 0.11) - cocoapods-try (1.2.0) - colored2 (3.1.2) - concurrent-ruby (1.1.9) - escape (0.0.4) - ethon (0.14.0) - ffi (>= 1.15.0) - ffi (1.15.4) - fourflusher (2.3.1) - fuzzy_match (2.0.4) - generator (0.0.1) - gh_inspector (1.1.3) - httpclient (2.8.3) - i18n (1.8.10) - concurrent-ruby (~> 1.0) - json (2.5.1) - lazy_priority_queue (0.1.1) - minitest (5.14.4) - 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 (2.5.1) - stream (0.5.3) - generator - typhoeus (1.4.0) - ethon (>= 0.9.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) - colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (~> 3.2.4) - xcpretty (0.3.0) - rouge (~> 2.0.7) - zeitwerk (2.4.2) - -PLATFORMS - x86_64-darwin-20 - -DEPENDENCIES - cocoapods-binary-cache! - cocoapods-prune-localizations - -BUNDLED WITH - 2.2.22 From 6f24a17023863ab06f4a2d7336102393733debde Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Wed, 15 Sep 2021 11:46:07 -0500 Subject: [PATCH 12/19] Bundle route --- .github/workflows/test_only.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_only.yml b/.github/workflows/test_only.yml index e3aee4c5..6f06b09d 100644 --- a/.github/workflows/test_only.yml +++ b/.github/workflows/test_only.yml @@ -38,7 +38,7 @@ jobs: - name: Clean and Build run: | - bundle exec xcodebuild \ + xcodebuild \ CODE_SIGN_IDENTITY="" \ CODE_SIGNING_REQUIRED=NO \ -workspace SelfControl.xcworkspace \ From 71d6fd205ba13972e3ea5b3453e5b2a58b3e3d65 Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Wed, 15 Sep 2021 11:49:08 -0500 Subject: [PATCH 13/19] Bundle route --- Podfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Podfile b/Podfile index 7b1135d0..c1cd0c7f 100644 --- a/Podfile +++ b/Podfile @@ -10,10 +10,10 @@ plugin 'cocoapods-prune-localizations', { :localizations => supported_locales } target "SelfControl" do use_frameworks! :linkage => :static - pod 'MASPreferences', '~> 1.1.4' - pod 'TransformerKit', '~> 1.1.1' - pod 'FormatterKit/TimeIntervalFormatter', '~> 1.8.0' - pod 'LetsMove', '~> 1.24' + pod 'MASPreferences' + pod 'TransformerKit' + pod 'FormatterKit/TimeIntervalFormatter' + pod 'LetsMove' pod 'Sentry', :git => 'https://github.com/getsentry/sentry-cocoa.git', :tag => '7.3.0' # Add test target From 1315dc649764f050d84a097f5f1a53c71c7a7986 Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Mon, 4 Oct 2021 21:15:16 -0500 Subject: [PATCH 14/19] Trying again with cocoapods only. --- .github/workflows/test_only.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_only.yml b/.github/workflows/test_only.yml index 6f06b09d..a022e117 100644 --- a/.github/workflows/test_only.yml +++ b/.github/workflows/test_only.yml @@ -29,12 +29,15 @@ jobs: run: | # bundle config path vendor/bundle # bundle config set without 'default doc job cable storage ujs test db' - bundle install --jobs 4 --retry 3 + # bundle install --jobs 4 --retry 3 + gem install cocoapods - name: Install Dependences run: | - bundle exec pod update - bundle exec pod install + # bundle exec pod update + # bundle exec pod install + pod update + pod install - name: Clean and Build run: | From e089ae8eda81c8acde43b5e93360b4150df550fd Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Mon, 4 Oct 2021 21:17:38 -0500 Subject: [PATCH 15/19] Add missing gem --- .github/workflows/test_only.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test_only.yml b/.github/workflows/test_only.yml index a022e117..1c1e0afb 100644 --- a/.github/workflows/test_only.yml +++ b/.github/workflows/test_only.yml @@ -31,6 +31,7 @@ jobs: # bundle config set without 'default doc job cable storage ujs test db' # bundle install --jobs 4 --retry 3 gem install cocoapods + gem install cocoapods-prune-localizations - name: Install Dependences run: | From 075de9f85235d1c4b078aa4c721d1063bed97325 Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Mon, 4 Oct 2021 21:30:54 -0500 Subject: [PATCH 16/19] Reverted podfile changes --- Podfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Podfile b/Podfile index c1cd0c7f..7b1135d0 100644 --- a/Podfile +++ b/Podfile @@ -10,10 +10,10 @@ plugin 'cocoapods-prune-localizations', { :localizations => supported_locales } target "SelfControl" do use_frameworks! :linkage => :static - pod 'MASPreferences' - pod 'TransformerKit' - pod 'FormatterKit/TimeIntervalFormatter' - pod 'LetsMove' + pod 'MASPreferences', '~> 1.1.4' + 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.3.0' # Add test target From 61f568d23792ebe95f811a80a6134603a9bb3b67 Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Mon, 4 Oct 2021 22:27:06 -0500 Subject: [PATCH 17/19] Updating code based on MASPreferencesDemo. https://github.com/shpakovski/MASPreferencesDemo --- Podfile | 2 +- PreferencesAdvancedViewController.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Podfile b/Podfile index 7b1135d0..d58d1fe7 100644 --- a/Podfile +++ b/Podfile @@ -10,7 +10,7 @@ plugin 'cocoapods-prune-localizations', { :localizations => supported_locales } target "SelfControl" do use_frameworks! :linkage => :static - pod 'MASPreferences', '~> 1.1.4' + pod 'MASPreferences', :git => 'https://github.com/shpakovski/MASPreferences', :tag => '1.3' pod 'TransformerKit', '~> 1.1.1' pod 'FormatterKit/TimeIntervalFormatter', '~> 1.8.0' pod 'LetsMove', '~> 1.24' diff --git a/PreferencesAdvancedViewController.h b/PreferencesAdvancedViewController.h index 63ade777..c8070793 100644 --- a/PreferencesAdvancedViewController.h +++ b/PreferencesAdvancedViewController.h @@ -7,8 +7,8 @@ // #import -#import "MASPreferencesViewController.h" +#import @interface PreferencesAdvancedViewController : NSViewController - + @end From c3625b7a904e1c2d615d3ebc97184d8a1f772307 Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Mon, 4 Oct 2021 22:48:46 -0500 Subject: [PATCH 18/19] . --- .github/workflows/test_only.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_only.yml b/.github/workflows/test_only.yml index 1c1e0afb..9a65b50f 100644 --- a/.github/workflows/test_only.yml +++ b/.github/workflows/test_only.yml @@ -43,11 +43,12 @@ jobs: - name: Clean and Build run: | xcodebuild \ - CODE_SIGN_IDENTITY="" \ - CODE_SIGNING_REQUIRED=NO \ + -parallelizeTargets -workspace SelfControl.xcworkspace \ -scheme "SelfControl" \ - -configuration Release \ + -configuration "Release" \ + CODE_SIGN_IDENTITY="" \ + CODE_SIGNING_REQUIRED=NO \ clean build # v2 From 98c544d5cb5bf49957457fada81a9d53690b07f8 Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Mon, 4 Oct 2021 23:02:45 -0500 Subject: [PATCH 19/19] . --- .github/workflows/test_only.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_only.yml b/.github/workflows/test_only.yml index 9a65b50f..c65710ed 100644 --- a/.github/workflows/test_only.yml +++ b/.github/workflows/test_only.yml @@ -43,12 +43,12 @@ jobs: - name: Clean and Build run: | xcodebuild \ + CODE_SIGN_IDENTITY="" \ + CODE_SIGNING_REQUIRED=NO \ -parallelizeTargets -workspace SelfControl.xcworkspace \ -scheme "SelfControl" \ -configuration "Release" \ - CODE_SIGN_IDENTITY="" \ - CODE_SIGNING_REQUIRED=NO \ clean build # v2