diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index e6c5a773..9bccf524 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -34,14 +34,6 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Cache packages - uses: actions/cache@v3 - id: packages-cache - with: - path: ~/Library/Caches/org.swift.swiftpm - key: ${{ runner.os }}-packages-${{ hashFiles('**/Package.resolved') }} - restore-keys: ${{ runner.os }}-packages- - - name: Run tests run: | make test-${{ matrix.platform }} @@ -72,16 +64,6 @@ jobs: ${{ secrets.APP_STORE_CONNECT_API_KEY_B64 }} \ ${{ secrets.APPLE_ACCOUNT_INFO_B64 }} - - name: Cache packages - uses: actions/cache@v3 - id: packages-demo-cache - with: - path: ~/Demo/Packages - key: | - ${{ runner.os }}-demo-packages-\ - ${{ hashFiles('Demo/**/Package.resolved') }} - restore-keys: ${{ runner.os }}-demo-packages- - - name: Archive the demo run: | make archive-demo-${{ matrix.platform }} diff --git a/fastlane/Fastfile b/fastlane/Fastfile index f6023785..34fe358a 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -117,9 +117,7 @@ def build_and_sign_app(platform_id, configuration_id) export_team_id: ENV.fetch('TEAM_ID'), output_directory: 'Binaries', xcargs: "-authenticationKeyIssuerID #{ENV.fetch('KEY_ISSUER_ID')} -authenticationKeyID #{ENV.fetch('KEY_ID')} " \ - "-authenticationKeyPath #{api_key_filepath} -allowProvisioningUpdates", - cloned_source_packages_path: '~/Demo/Packages', - skip_package_dependencies_resolution: ENV['HAS_PACKAGES_CACHE_HIT'] == 'true' + "-authenticationKeyPath #{api_key_filepath} -allowProvisioningUpdates" ) end @@ -199,9 +197,7 @@ def run_package_tests(platform_id, scheme_name) number_of_retries: 3, clean: true, fail_build: false, - xcargs: '-testLanguage en -testRegion en_US', - cloned_source_packages_path: '~/Library/Caches/org.swift.swiftpm', - skip_package_dependencies_resolution: ENV['HAS_PACKAGES_CACHE_HIT'] == 'true' + xcargs: '-testLanguage en -testRegion en_US' ) trainer( path: 'fastlane/test_output',