Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove broken test and speed up iOS CI #5390

Merged
merged 2 commits into from
Nov 10, 2023
Merged

Remove broken test and speed up iOS CI #5390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fc7726
Use bigger runners and yeetd
pinkisemils Nov 8, 2023
7704e46
Remove offending test
pinkisemils Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions .github/workflows/ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: iOS app
on:

Check warning on line 3 in .github/workflows/ios.yml

View workflow job for this annotation

GitHub Actions / check-formatting 

3:1 [truthy] truthy value should be one of [false, true]
pull_request:
paths:
- .github/workflows/ios.yml
Expand All @@ -11,7 +11,7 @@
jobs:
check-formatting:
name: Check formatting
runs-on: macos-13
runs-on: macos-13-xlarge
steps:
- name: Install SwiftFormat
run: |
Expand All @@ -29,20 +29,21 @@

swiftlint:
name: Run swiftlint
runs-on: macos-13
runs-on: macos-13-xlarge
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Run swiftlint
run: |
brew install swiftlint
swiftlint --version
swiftlint --reporter github-actions-logging
working-directory: ios

test:
name: Unit tests
runs-on: macos-13
runs-on: macos-13-xlarge
env:
SOURCE_PACKAGES_PATH: .spm
steps:
Expand All @@ -62,12 +63,17 @@
with:
go-version: 1.19.5

- name: Set up yeetd to workaround XCode being slow in CI
run: |
wget https://github.com/biscuitehh/yeetd/releases/download/1.0/yeetd-normal.pkg
sudo installer -pkg yeetd-normal.pkg -target /
yeetd &
- name: Configure Xcode
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.0.1'
- name: Configure Rust
run: rustup target add x86_64-apple-ios
run: rustup target add aarch64-apple-ios-sim

- name: Configure Xcode project
run: |
Expand Down
7 changes: 6 additions & 1 deletion ios/PacketTunnelCoreTests/PacketTunnelActorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,12 @@ final class PacketTunnelActorTests: XCTestCase {
await fulfillment(of: [disconnectedStateExpectation, didStopObserverExpectation], timeout: 1)
}

func testSetErrorStateGetsCancelledWhenStopping() async throws {
// FIXME: Reconsider if this test should exist. As it stands currently, it
// relies the packet tunnel process processing app message calls and a
// `stopTunnel()` call in a particular, deterministic order, which makes it
// unreliable. In reality, we cannot guarantee the order between those
// calls, and it fails almost reliably on low core count VMs.
func setErrorStateGetsCancelledWhenStopping() async throws {
let actor = PacketTunnelActor.mock()
let connectingStateExpectation = expectation(description: "Connecting state")
let disconnectedStateExpectation = expectation(description: "Disconnected state")
Expand Down
Loading