Compare commits

...

5 Commits

Author SHA1 Message Date
karol 63e175c76a chore: rename applicationId and app name to isolate fork from official app
CI Pipeline / Android Lint (push) Successful in 1m34s
CI Pipeline / Unit Tests (push) Successful in 1m10s
CI Pipeline / Build and Upload APK (push) Successful in 2m24s
2026-09-18 20:31:23 +02:00
karol 8142073abd chore: trigger Gitea Actions
CI Pipeline / Android Lint (push) Successful in 2m4s
CI Pipeline / Unit Tests (push) Successful in 1m8s
CI Pipeline / Build and Upload APK (push) Successful in 2m30s
2026-09-18 19:38:36 +02:00
karol 149c620525 ci: use PERSONAL_ACCESS_TOKEN for auto-update to trigger downstream pipelines 2026-09-18 18:57:04 +02:00
karol c96b0e3617 ci: add scheduled workflow to auto-sync upstream changes 2026-09-18 18:55:15 +02:00
karol 268c27dc4a build: output both signed release and debug APKs 2026-09-18 18:52:19 +02:00
4 changed files with 68 additions and 9 deletions
+56
View File
@@ -0,0 +1,56 @@
name: Auto-Sync Upstream
on:
schedule:
- cron: '0 3 * * *' # Uruchamia się codziennie o 3:00 w nocy
workflow_dispatch: # Pozwala uruchomić to ręcznie z poziomu Gitea
permissions:
contents: write
jobs:
sync:
name: Sync with Upstream
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: main
token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
- name: Configure Git & Fetch
run: |
git config user.name "Gitea Actions Bot"
git config user.email "actions@gitea.local"
git remote add upstream https://gitea.local.labus.uk/upstream-mirrors/OpenTracks.git
git fetch upstream main
- name: Check for updates & Attempt Merge
id: merge
run: |
# Sprawdzamy czy są jakiekolwiek nowe zmiany
if git diff --quiet HEAD upstream/main; then
echo "Repozytorium jest aktualne. Brak zmian."
echo "has_changes=false" >> $GITHUB_ENV
exit 0
fi
echo "Znaleziono nowe zmiany. Próbuję scalić..."
echo "has_changes=true" >> $GITHUB_ENV
# Próba automatycznego scalenia (merge)
if git merge upstream/main --no-edit; then
echo "Scalenie przebiegło pomyślnie!"
else
echo "Wykryto konflikty! Przerywam scalanie."
git merge --abort
exit 1 # Błąd celowy - Gitea wyśle Ci powiadomienie o failu
fi
- name: Push changes
if: env.has_changes == 'true'
run: |
git push origin main
echo "Zmiany pomyślnie wypchnięte do repozytorium!"
+3 -1
View File
@@ -55,7 +55,9 @@ jobs:
- name: Build APKs
shell: bash
run: ./gradlew assembleDebug
run: |
./gradlew assembleDebug
./gradlew assembleRelease
- name: Prepare APKs
shell: bash
+7 -6
View File
@@ -46,7 +46,7 @@ android {
}
defaultConfig {
applicationId 'de.dennisguse.opentracks'
applicationId 'de.dennisguse.opentracks.fork'
versionCode 6751
versionName "v4.28.3"
@@ -98,6 +98,7 @@ android {
release {
crunchPngs = false
minifyEnabled = false
signingConfig signingConfigs.debug
}
}
@@ -106,18 +107,18 @@ android {
productFlavors {
nightly {
dimension 'version'
applicationId 'de.dennisguse.opentracks.nightly'
applicationId 'de.dennisguse.opentracks.fork.nightly'
versionCode getVersionCodeNightly()
versionName getVersionName()
base.archivesName = "de.dennisguse.opentracks.nightly_${getVersionCodeNightly()}"
base.archivesName = "de.dennisguse.opentracks.fork.nightly_${getVersionCodeNightly()}"
signingConfig = signingConfigs.nightly
}
irreproducible {
// Non-reproducible: https://f-droid.org/de/packages/de.dennisguse.opentracks/
dimension 'version'
applicationId 'de.dennisguse.opentracks'
applicationId 'de.dennisguse.opentracks.fork'
versionNameSuffix 'irreproducible'
}
reproducible {
@@ -125,9 +126,9 @@ android {
// FDroid: https://f-droid.org/de/packages/de.dennisguse.opentracks.playstore
// PlayStore: https://play.google.com/store/apps/details?id=de.dennisguse.opentracks.playstore
dimension 'version'
applicationId 'de.dennisguse.opentracks.playstore'
applicationId 'de.dennisguse.opentracks.fork.playstore'
base.archivesName = "de.dennisguse.opentracks.playstore_${getVersionName()}_${android.defaultConfig.versionCode}"
base.archivesName = "de.dennisguse.opentracks.fork.playstore_${getVersionName()}_${android.defaultConfig.versionCode}"
signingConfig = signingConfigs.release
}
+2 -2
View File
@@ -15,8 +15,8 @@ limitations under the License.
-->
<resources>
<string name="app_web_url" translatable="false">https://codeberg.org/OpenTracksApp/OpenTracks</string>
<string name="app_name" translatable="false">OpenTracks</string>
<string name="launcher_name" translatable="false">OpenTracks</string>
<string name="app_name" translatable="false">OpenTracks (Fork)</string>
<string name="launcher_name" translatable="false">OpenTracks (Fork)</string>
<string name="egm2008" translatable="false">EGM2008</string>
<string name="wgs84" translatable="false">WGS84</string>