Skip to content

Commit

Permalink
Remove SPM cache and specific dir for Derived Data
Browse files Browse the repository at this point in the history
  • Loading branch information
waliid committed Nov 4, 2024
1 parent da216b7 commit 5e2c3db
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 20 deletions.
14 changes: 2 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,6 @@ jobs:
./run-vm-shell-command.sh ${{ env.vm_name }} "security unlock-keychain -p 'admin' ~/Library/Keychains/login.keychain-db && security import ~/_repo/Configuration/6YXTQTG8JJ_development.p12 -k ~/Library/Keychains/login.keychain-db -P '6YXTQTG8JJ' -T /usr/bin/security -T /usr/bin/codesign"
./run-vm-shell-command.sh ${{ env.vm_name }} "security set-key-partition-list -S apple-tool:,apple: -s -k 'admin' ~/Library/Keychains/login.keychain-db"
./run-vm-shell-command.sh ${{ env.vm_name }} "cd ~/_repo && make setup"
cache-management:
needs: install-tools
runs-on: ${{ needs.install-tools.outputs.runner_group_label }}
steps:
- name: Restore caches on VM
run: |
cd ~/macos-ci-setup
./restore-vm-caches.sh ${{ env.vm_name }}
# check-quality:
# needs: setup-project
Expand All @@ -76,15 +67,15 @@ jobs:
~/macos-ci-setup/run-vm-shell-command.sh ${{ env.vm_name }} "cd ~/_repo && make test-streams-start"
test-ios:
needs: [install-tools, cache-management, run-streams, setup-project]
needs: [install-tools, run-streams, setup-project]
runs-on: ${{ needs.install-tools.outputs.runner_group_label }}
steps:
- name: Run the iOS tests
run: |
~/macos-ci-setup/run-vm-shell-command.sh ${{ env.vm_name }} "cd ~/_repo && make test-ios"
test-tvos:
needs: [install-tools, cache-management, run-streams, setup-project]
needs: [install-tools, run-streams, setup-project]
runs-on: ${{ needs.install-tools.outputs.runner_group_label }}
steps:
- name: Run the tvOS tests
Expand Down Expand Up @@ -115,6 +106,5 @@ jobs:
- name: Stop and remove the VM
run: |
set +e
~/macos-ci-setup/store-vm-caches.sh ${{ env.vm_name }}
tart stop ${{ env.vm_name }}
tart delete ${{ env.vm_name }}
9 changes: 1 addition & 8 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,11 @@ def bump_testflight_build_number(platform_id, configuration_id)
end

def build_and_sign_app(platform_id, configuration_id)
derived_data_path = "#{Dir.home}/Library/Developer/Xcode/DerivedData/#{platform_id}"
FileUtils.mkdir_p(derived_data_path)
build_app(
project: 'Demo/Pillarbox-demo.xcodeproj',
configuration: CONFIGURATIONS[configuration_id],
scheme: 'Pillarbox-demo',
destination: "generic/platform=#{PLATFORMS[platform_id]}",
derived_data_path: derived_data_path,
export_team_id: ENV.fetch('TEAM_ID'),
output_directory: 'Binaries',
xcargs: "-authenticationKeyIssuerID #{ENV.fetch('KEY_ISSUER_ID')} -authenticationKeyID #{ENV.fetch('KEY_ID')} " \
Expand Down Expand Up @@ -193,17 +190,13 @@ def deliver_demo_release(platform_id)
end

def run_package_tests(platform_id, scheme_name)
output_path = "fastlane/test_output_#{platform_id}"
derived_data_path = "#{Dir.home}/Library/Developer/Xcode/DerivedData/#{platform_id}"
FileUtils.mkdir_p(output_path)
FileUtils.mkdir_p(derived_data_path)
run_tests(
scheme: scheme_name,
device: DEVICES[platform_id],
package_path: '.',
result_bundle: true,
output_directory: output_path,
derived_data_path: derived_data_path,
output_directory: "fastlane/test_output",
number_of_retries: 3,
fail_build: false,
xcargs: '-testLanguage en -testRegion en_US'
Expand Down

0 comments on commit 5e2c3db

Please sign in to comment.