Skip to content

Commit

Permalink
Fixed Build Error
Browse files Browse the repository at this point in the history
  • Loading branch information
niyajali committed Sep 6, 2024
1 parent dab2f13 commit 51286d2
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/master_dev_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,22 +180,22 @@ jobs:
continue-on-error: true
run: ./gradlew :androidApp:checkReleaseBadging

- name: Prevent updating Dependency Guard baselines if this is a fork
- name: Prevent updating release badging if this is a fork
id: checkfork_badging
if: steps.badging_verify.outcome == 'failure' && github.event.pull_request.head.repo.full_name != github.repository
run: |
echo "::error::Dependency Guard failed, please update badging with: ./gradlew updateReleaseBadging" && exit 1
echo "::error::Release Badging failed, please update badging with: ./gradlew updateReleaseBadging" && exit 1
# Runs if previous job failed
- name: Generate new Dependency Guard baselines if verification failed and it's a PR
- name: Generate new release badging if verification failed and it's a PR
id: generate_badging
if: steps.checkfork_badging.outcome == 'failure' && github.event_name == 'pull_request'
run: |
./gradlew updateReleaseBadging
- name: Push new Dependency Guard baselines if available
- name: Push new release badging if available
uses: stefanzweifel/git-auto-commit-action@v5
if: steps.generate_badging.outcome == 'success'
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/onPush.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:

jobs:
app_build:
name: Github, Firebase, and Sentry Release
name: Github Release
runs-on: ubuntu-latest
permissions:
contents: write
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
run: |
./gradlew :androidApp:bundleRelease
- name: Deploy to Playstore Internal
- name: Deploy to Play Store Internal
run: bundle exec fastlane deploy_internal

- name: Promote Internal to Beta
Expand Down
2 changes: 1 addition & 1 deletion androidApp/release-badging.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package: name='org.mifos.mobile' versionCode='1' versionName='0.0.1-beta.0.1442+20240906T133838Z' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
package: name='org.mifos.mobile' versionCode='1' versionName='0.0.1-beta.0.1445+20240906T175646Z' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
sdkVersion:'26'
targetSdkVersion:'34'
uses-permission: name='android.permission.INTERNET'
Expand Down
5 changes: 3 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ plugins {
alias(libs.plugins.jetbrainsCompose) apply false
}

tasks.register("versionFile").configure {
tasks.register("versionFile") {
group = "publishing"
doLast {
File(projectDir, "version.txt").writeText(project.version.toString())
println(project.version)
project.rootProject.file("version.txt").writeText(project.version.toString())
}
}
4 changes: 2 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ plugins {

extensions.configure<ReckonExtension> {
setDefaultInferredScope("patch")
stages("beta", "rc", "final")
stages("beta", "final")
setScopeCalc { java.util.Optional.of(org.ajoberstar.reckon.core.Scope.PATCH) }
setScopeCalc(calcScopeFromProp().or(calcScopeFromCommitMessages()))
// setScopeCalc(calcScopeFromProp().or(calcScopeFromCommitMessages()))
setStageCalc(calcStageFromProp())
setTagWriter { it.toString() }
}
Expand Down

0 comments on commit 51286d2

Please sign in to comment.