summaryrefslogtreecommitdiffhomepage
path: root/.github
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2023-03-22 09:02:51 +0100
committerAlbin <albin@mullvad.net>2023-03-22 10:39:58 +0100
commitdb4f178944e1821eae1a89e85bb2b973cccaa4c7 (patch)
tree6dd4971c2d258b6cbf8681a946ee5869122ecdd7 /.github
parentd673717163b99f3de02e9338ed2b21389a4ee542 (diff)
downloadmullvadvpn-db4f178944e1821eae1a89e85bb2b973cccaa4c7.tar.xz
mullvadvpn-db4f178944e1821eae1a89e85bb2b973cccaa4c7.zip
Change action from `ktlint` to `ktfmt`
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/android-kotlin-format-check.yml14
-rw-r--r--.github/workflows/android-ktlint.yml21
2 files changed, 14 insertions, 21 deletions
diff --git a/.github/workflows/android-kotlin-format-check.yml b/.github/workflows/android-kotlin-format-check.yml
new file mode 100644
index 0000000000..52a5f43e71
--- /dev/null
+++ b/.github/workflows/android-kotlin-format-check.yml
@@ -0,0 +1,14 @@
+---
+name: Android - Check kotlin formatting
+on:
+ pull_request:
+ paths: [.github/workflows/android-ktlint.yml, android/**/*.kt]
+ workflow_dispatch:
+jobs:
+ check-formatting:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+
+ - name: Run ktfmt check
+ run: android/gradlew -p android ktfmtCheck
diff --git a/.github/workflows/android-ktlint.yml b/.github/workflows/android-ktlint.yml
deleted file mode 100644
index 70aad1c264..0000000000
--- a/.github/workflows/android-ktlint.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: Android - Kotlin linter
-on:
- pull_request:
- paths: [.github/workflows/android-ktlint.yml, android/**/*.kt]
- workflow_dispatch:
-jobs:
- ktlint:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v3
-
- - name: Install Ktlint
- uses: nbadal/action-ktlint-setup@v1
- with:
- ktlint_version: 0.45.1
-
- - name: Check formatting
- run: |-
- cd android
- ktlint -a