From 76623c241b1ea3588d94696cabf79f3845a0c8b9 Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Mon, 10 Jan 2022 12:34:08 -0700 Subject: [PATCH] update ci --- .github/workflows/lint-pr.yaml | 8 ++++---- .github/workflows/lint.yml | 23 ----------------------- .swiftformat | 1 - Swiftfin/App/AppDelegate.swift | 2 +- 4 files changed, 5 insertions(+), 29 deletions(-) delete mode 100644 .github/workflows/lint.yml diff --git a/.github/workflows/lint-pr.yaml b/.github/workflows/lint-pr.yaml index 8f1f89ad..74f339c4 100644 --- a/.github/workflows/lint-pr.yaml +++ b/.github/workflows/lint-pr.yaml @@ -8,10 +8,10 @@ jobs: build: name: "Lint 🧹" runs-on: macos-latest - + steps: - name: Checkout uses: actions/checkout@v2.3.4 - - - name: Run SwiftLint - run: swiftlint + + - name: Run Swiftformat + run: swiftformat . --lint diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml deleted file mode 100644 index 1486cf73..00000000 --- a/.github/workflows/lint.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: "Lint 🧹" - -on: - push: - branches: [ main ] - -jobs: - build: - name: "Lint 🧹" - runs-on: macos-latest - - steps: - - name: Checkout - uses: actions/checkout@v2.3.4 - - - name: Run SwiftLint - run: swiftlint --fix - - - name: Create Pull Request - uses: peter-evans/create-pull-request@v3 - with: - title: "[ci] SwiftLint" - reviewers: "acvigue" diff --git a/.swiftformat b/.swiftformat index a4733581..7b35d0a4 100644 --- a/.swiftformat +++ b/.swiftformat @@ -5,7 +5,6 @@ --indent tab --tabwidth 4 --xcodeindentation enabled ---self init-only --semicolons never --stripunusedargs closure-only --maxwidth 140 diff --git a/Swiftfin/App/AppDelegate.swift b/Swiftfin/App/AppDelegate.swift index f4284e0a..aacfa0b9 100644 --- a/Swiftfin/App/AppDelegate.swift +++ b/Swiftfin/App/AppDelegate.swift @@ -14,7 +14,7 @@ class AppDelegate: NSObject, UIApplicationDelegate { static var orientationLock = UIInterfaceOrientationMask.all func application(_ application: UIApplication, - didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool { // Lazily initialize datastack