From eb1eb415a5b932ea0e44ee0bd52831f586133b31 Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Thu, 21 Oct 2021 11:07:01 -0700 Subject: [PATCH 1/2] Update swift.yml --- .github/workflows/swift.yml | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index fa5c4090..ffec2ab2 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -3,7 +3,7 @@ name: Swift on: push: branches: [ main ] - pull_request: + pull_request_target: branches: [ main ] jobs: @@ -47,12 +47,6 @@ jobs: - uses: webfactory/ssh-agent@v0.5.3 with: ssh-private-key: ${{ secrets.SOVRAN_SSH_KEY }} - # Workarounds for Xcode/SPM failing to get packages - - run: sudo defaults write com.apple.dt.Xcode IDEPackageSupportUseBuiltinSCM YES - - run: rm ~/.ssh/id_rsa || true - - run: for ip in $(dig @8.8.8.8 bitbucket.org +short); do ssh-keyscan bitbucket.org,$ip; ssh-keyscan $ip; done 2>/dev/null >> ~/.ssh/known_hosts || true - - run: for ip in $(dig @8.8.8.8 github.com +short); do ssh-keyscan github.com,$ip; ssh-keyscan $ip; done 2>/dev/null >> ~/.ssh/known_hosts || true - # Xcodebuild will automatically build so no need to call it out specifically. - run: xcodebuild -scheme Segment-Package test -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 11' build_and_test_tvos: @@ -65,12 +59,6 @@ jobs: - uses: webfactory/ssh-agent@v0.5.3 with: ssh-private-key: ${{ secrets.SOVRAN_SSH_KEY }} - # Workarounds for Xcode/SPM failing to get packages - - run: sudo defaults write com.apple.dt.Xcode IDEPackageSupportUseBuiltinSCM YES - - run: rm ~/.ssh/id_rsa || true - - run: for ip in $(dig @8.8.8.8 bitbucket.org +short); do ssh-keyscan bitbucket.org,$ip; ssh-keyscan $ip; done 2>/dev/null >> ~/.ssh/known_hosts || true - - run: for ip in $(dig @8.8.8.8 github.com +short); do ssh-keyscan github.com,$ip; ssh-keyscan $ip; done 2>/dev/null >> ~/.ssh/known_hosts || true - # Xcodebuild will automatically build so no need to call it out specifically. - run: xcodebuild -scheme Segment-Package test -sdk appletvsimulator -destination 'platform=tvOS Simulator,name=Apple TV' build_and_test_watchos: @@ -83,12 +71,6 @@ jobs: - uses: webfactory/ssh-agent@v0.5.3 with: ssh-private-key: ${{ secrets.SOVRAN_SSH_KEY }} - # Workarounds for Xcode/SPM failing to get packages - - run: sudo defaults write com.apple.dt.Xcode IDEPackageSupportUseBuiltinSCM YES - - run: rm ~/.ssh/id_rsa || true - - run: for ip in $(dig @8.8.8.8 bitbucket.org +short); do ssh-keyscan bitbucket.org,$ip; ssh-keyscan $ip; done 2>/dev/null >> ~/.ssh/known_hosts || true - - run: for ip in $(dig @8.8.8.8 github.com +short); do ssh-keyscan github.com,$ip; ssh-keyscan $ip; done 2>/dev/null >> ~/.ssh/known_hosts || true - # Xcodebuild will automatically build so no need to call it out specifically. - run: xcodebuild -scheme Segment-Package test -sdk watchsimulator -destination 'platform=watchOS Simulator,name=Apple Watch Series 5 - 40mm' build_examples: @@ -101,11 +83,6 @@ jobs: - uses: webfactory/ssh-agent@v0.5.3 with: ssh-private-key: ${{ secrets.SOVRAN_SSH_KEY }} - # Workarounds for Xcode/SPM failing to get packages - - run: sudo defaults write com.apple.dt.Xcode IDEPackageSupportUseBuiltinSCM YES - - run: rm ~/.ssh/id_rsa || true - - run: for ip in $(dig @8.8.8.8 bitbucket.org +short); do ssh-keyscan bitbucket.org,$ip; ssh-keyscan $ip; done 2>/dev/null >> ~/.ssh/known_hosts || true - - run: for ip in $(dig @8.8.8.8 github.com +short); do ssh-keyscan github.com,$ip; ssh-keyscan $ip; done 2>/dev/null >> ~/.ssh/known_hosts || true - name: build for ios simulator run: | cd Examples/apps/BasicExample From 96d45b2a1de45109e12798391ab3ef6003b866bb Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Thu, 21 Oct 2021 11:16:04 -0700 Subject: [PATCH 2/2] Update swift.yml --- .github/workflows/swift.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index ffec2ab2..cd7e9378 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -3,6 +3,8 @@ name: Swift on: push: branches: [ main ] + pull_request: + branches: [ main ] pull_request_target: branches: [ main ]