Skip to content

Commit

Permalink
Merge pull request #29 from grzesiek2010/improvedCi
Browse files Browse the repository at this point in the history
Improved CI config file
  • Loading branch information
lognaturel authored Jan 25, 2023
2 parents 3763976 + bad755e commit 113b97d
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 15 deletions.
22 changes: 10 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,20 @@ on:
jobs:
build:
name: Setup Environment and build
runs-on: self-hosted
runs-on: ubuntu-latest
steps:
- name: Checkout the code to specific branch
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up JDK
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '11'

- name: Setup Android SDK
uses: android-actions/setup-android@v2
distribution: 'temurin'
cache: gradle

- name: Make gradlew executable
run: chmod +x ./gradlew

- name: Compile code
run: ./gradlew assembleDebug
run: chmod +x gradlew

- name: Run Kotlin Linter
run: ./gradlew ktlintCheck
Expand All @@ -36,4 +31,7 @@ jobs:
run: ./gradlew pmd

- name: Run Checkstyle
run: ./gradlew checkstyle
run: ./gradlew checkstyle

- name: Compile code
run: ./gradlew assembleDebug
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ local.properties
*.*~

# gradle env props
gradle.properties
secrets.properties

# built application files
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def getMasterCommitCount = { ->
}
return Integer.parseInt(stdout.toString().trim())
} catch (ignored) {
return -1;
return 1
}
}

Expand All @@ -50,7 +50,7 @@ def getVersionName = { ->
}
return stdout.toString().trim()
} catch (ignored) {
return null;
return null
}
}

Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
android.useAndroidX=true
android.enableJetifier=true

0 comments on commit 113b97d

Please sign in to comment.