diff --git a/.github/workflows/build_preview.yml b/.github/workflows/build_preview.yml
index 05f718998..42e3da9da 100644
--- a/.github/workflows/build_preview.yml
+++ b/.github/workflows/build_preview.yml
@@ -72,13 +72,10 @@ jobs:
run: |
set -e
- prev_commit_count=$(echo "${{ steps.last_release.outputs.tag_name }}" | sed -e "s/^r//")
- echo "prev_commit_count=$prev_commit_count"
+ commit_count_diff=$(git rev-list --count "${{ steps.last_release.outputs.tag_name }}"..HEAD)
# Fake at least 1 commits (to avoid no changes)
- if [ "${{ steps.current_commit.outputs.COMMIT_COUNT }}" -gt "$prev_commit_count" ]; then
- commit_count_diff="$(expr ${{ steps.current_commit.outputs.COMMIT_COUNT }} - $prev_commit_count)"
- else
+ if [ "${commit_count_diff}" -eq 0 ]; then
commit_count_diff=1
fi
@@ -218,12 +215,12 @@ jobs:
tag_name: ${{ needs.prepare-build.outputs.TAG_NAME }}
name: Komikku Preview ${{ needs.prepare-build.outputs.TAG_NAME }} (${{ needs.prepare-build.outputs.VERSION_TAG }})
body: |
- ## What's Changed
- ### New
+ ### What's Changed
+ #### New
- ### Improve
+ #### Improve
- ### Fix
+ #### Fix
**Full Changelog**: https://github.com/komikku-app/komikku/compare/${{ needs.prepare-build.outputs.PREV_TAG_NAME }}...${{ needs.prepare-build.outputs.TAG_NAME }}
diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
index 290627464..4f568f25b 100644
--- a/.github/workflows/build_release.yml
+++ b/.github/workflows/build_release.yml
@@ -60,13 +60,10 @@ jobs:
run: |
set -e
- prev_commit_count=$(echo "${{ steps.last_release.outputs.tag_name }}" | sed -e "s/^r//")
- echo "prev_commit_count=$prev_commit_count"
+ commit_count_diff=$(git rev-list --count "${{ steps.last_release.outputs.tag_name }}"..HEAD)
# Fake at least 1 commits (to avoid no changes)
- if [ "${{ steps.current_commit.outputs.COMMIT_COUNT }}" -gt "$prev_commit_count" ]; then
- commit_count_diff="$(expr ${{ steps.current_commit.outputs.COMMIT_COUNT }} - $prev_commit_count)"
- else
+ if [ "${commit_count_diff}" -eq 0 ]; then
commit_count_diff=1
fi
@@ -100,20 +97,6 @@ jobs:
with:
fetch-depth: 0
- - name: Clone Submodule
- run: |
- mkdir -p $HOME/.ssh
- echo '${{ secrets.ADBLOCKANDROID_DEPLOY }}' > $HOME/.ssh/ssh.key
- chmod 600 $HOME/.ssh/ssh.key
- export GIT_SSH_COMMAND="ssh -i $HOME/.ssh/ssh.key"
- git submodule set-url ${{ env.SUBMODULE_PATH }} git@github.com:${{ env.REPO }}.git
- git submodule update --init --recursive
- git submodule set-url ${{ env.SUBMODULE_PATH }} https://github.com/${{ env.REPO }}.git
- unset GIT_SSH_COMMAND
- env:
- SUBMODULE_PATH: AdblockAndroid
- REPO: komikku-app/AdblockAndroid
-
- name: Validate Gradle Wrapper
uses: gradle/actions/wrapper-validation@d156388eb19639ec20ade50009f3d199ce1e2808 # v4
@@ -208,14 +191,14 @@ jobs:
tag_name: ${{ needs.prepare-build.outputs.VERSION_TAG }}
name: Komikku ${{ needs.prepare-build.outputs.VERSION_TAG }}
body: |
- ## What's Changed
- ### New
+ ### What's Changed
+ #### New
- ### Improve
+ #### Improve
- ### Fix
+ #### Fix
- #### Based on
+ ##### Based on
**Full Changelog**: https://github.com/komikku-app/komikku/compare/${{ needs.prepare-build.outputs.PREV_TAG_NAME }}...${{ needs.prepare-build.outputs.VERSION_TAG }}
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 659871b57..6337809ea 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -33,7 +33,7 @@ android {
applicationId = "app.komikku"
versionCode = 71
- versionName = "1.11.3"
+ versionName = "1.12.0"
buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")
diff --git a/app/src/main/res/raw/changelog_preview.xml b/app/src/main/res/raw/changelog_preview.xml
index 70896d25a..1311516cb 100644
--- a/app/src/main/res/raw/changelog_preview.xml
+++ b/app/src/main/res/raw/changelog_preview.xml
@@ -8,7 +8,7 @@
[b]Improve:[/b] rework panorama cover settings (@Cuong-Tran)
[b]Improve:[/b] update all trackers based on common data when new tracker is added (@Cuong-Tran)
[b]Improve:[/b] show a toast whenever progress is synced from Trackers (@Cuong-Tran)
- [b]Improve:[/b] Allow completely disabling "Update tracker" snackbar on mark as read (@Roshan Varughese)
+ [b]Improve:[/b] Allow Always/Ask/Nerver update trackers on mark as read (@Roshan Varughese)
[b]Improve:[/b] Avoid blocking call causing lag in settings (@Cuong-Tran)
[b]Fix:[/b] for ExHentai (@az4521, @jobobby04)
[b]Fix:[/b] sync progress from tracker not working if chapters order is messed up after backup restoration (@Cuong-Tran)
diff --git a/app/src/main/res/raw/changelog_release.xml b/app/src/main/res/raw/changelog_release.xml
index 481331269..7cbc1e067 100644
--- a/app/src/main/res/raw/changelog_release.xml
+++ b/app/src/main/res/raw/changelog_release.xml
@@ -39,7 +39,7 @@
[b]Improve:[/b] rework panorama cover settings
[b]Improve:[/b] update all trackers based on common data when new tracker is added
[b]Improve:[/b] show a toast whenever progress is synced from Trackers
- [b]Improve:[/b] Allow completely disabling "Update tracker" snackbar on mark as read
+ [b]Improve:[/b] Allow Always/Ask/Nerver update trackers on mark as read
[b]Improve:[/b] Avoid blocking call causing lag in settings
[b]Improve:[/b] Add Quantity Badge to Upcoming Screen
[b]Improve:[/b] make global search pinned/all sticky