diff options
| author | Steffen <steffen.ernst@mullvad.net> | 2025-08-25 12:37:41 +0200 |
|---|---|---|
| committer | Bug Magnet <marco.nikic@mullvad.net> | 2025-09-30 11:11:29 +0200 |
| commit | d245030d373720aa627d5577e9251504ea2e9305 (patch) | |
| tree | 7a3b847ad9b32d691937ffe3f7896d935a34a4c9 /.github | |
| parent | ceca0206a3af013470ab77d34468e76aa129fd78 (diff) | |
| download | mullvadvpn-d245030d373720aa627d5577e9251504ea2e9305.tar.xz mullvadvpn-d245030d373720aa627d5577e9251504ea2e9305.zip | |
Switch swiftformat to swift-format
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ios-screenshots-tests.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/ios-validate-build-schemas.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/ios.yml | 31 |
3 files changed, 7 insertions, 28 deletions
diff --git a/.github/workflows/ios-screenshots-tests.yml b/.github/workflows/ios-screenshots-tests.yml index a091ac658e..c7fe27422f 100644 --- a/.github/workflows/ios-screenshots-tests.yml +++ b/.github/workflows/ios-screenshots-tests.yml @@ -8,7 +8,7 @@ on: - main paths: - .github/workflows/ios.yml - - ios/.swiftformat + - ios/.swift-format - ios/**/*.swift - ios/**/*.xctestplan workflow_dispatch: diff --git a/.github/workflows/ios-validate-build-schemas.yml b/.github/workflows/ios-validate-build-schemas.yml index 46d87c0077..07499a5849 100644 --- a/.github/workflows/ios-validate-build-schemas.yml +++ b/.github/workflows/ios-validate-build-schemas.yml @@ -9,7 +9,7 @@ on: paths: - .github/workflows/ios.yml - .github/workflows/ios-validate-build-schemas.yml - - ios/.swiftformat + - ios/.swift-format - ios/**/*.swift - ios/**/*.xctestplan - Cargo.toml diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 48184d848d..2a8409139c 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -5,7 +5,7 @@ on: paths: - .github/workflows/ios.yml - ios/build-rust-library.sh - - ios/.swiftformat + - ios/.swift-format - ios/wireguard-apple - ios/**/*.swift - ios/**/*.xctestplan @@ -14,36 +14,15 @@ on: permissions: {} jobs: - check-formatting: - name: Check formatting + swift-format: + name: Run swift format lint runs-on: macos-15 steps: - - name: Install SwiftFormat - run: | - brew update - brew upgrade swiftformat - - name: Checkout repository uses: actions/checkout@v4 - - name: Check formatting - run: | - swiftformat --version - swiftformat --lint . - working-directory: ios - - swiftlint: - name: Run swiftlint - runs-on: macos-15 - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Run swiftlint - run: | - brew install swiftlint - swiftlint --version - swiftlint --reporter github-actions-logging + - name: Run swift format lint + run: ./lint.sh -s working-directory: ios ui-test-build: |