Moze wersja 1.0.0?
Deploy to FTP / deploy (push) Successful in 5s
Build APK / build (push) Successful in 2m11s

This commit is contained in:
Sebastian Molenda
2026-05-29 22:53:11 +02:00
parent 03bcb465cf
commit 244aa8457a
6 changed files with 56 additions and 4 deletions
+33 -4
View File
@@ -27,6 +27,22 @@ jobs:
- name: Grant execute permission - name: Grant execute permission
run: chmod +x ./gradlew run: chmod +x ./gradlew
- name: Update version in assets
run: |
set -e
TAG="${{ github.ref_name }}"
# Jeśli tag jest pusty (np. push nie na tag), użyjemy skróconego SHA
if [ -z "$TAG" ] || [ "$TAG" = "main" ]; then
TAG=$(git rev-parse --short HEAD)
fi
echo "Setting version to: $TAG"
# Aktualizacja pliku js/version.js
echo "const APP_VERSION = '$TAG';" > app/src/main/assets/js/version.js
echo "document.addEventListener('DOMContentLoaded', () => {
const el = document.getElementById('app-version') || document.getElementById('commit-sha');
if (el) el.textContent = '$TAG';
});" >> app/src/main/assets/js/version.js
- name: Build APK - name: Build APK
run: ./gradlew assembleRelease run: ./gradlew assembleRelease
@@ -116,6 +132,7 @@ jobs:
OWNER="${{ github.repository_owner }}" OWNER="${{ github.repository_owner }}"
REPO_NAME=$(echo "${{ github.repository }}" | cut -d/ -f2) REPO_NAME=$(echo "${{ github.repository }}" | cut -d/ -f2)
TAG="${{ github.ref_name }}"
if [ -z "$APK_PATH" ]; then if [ -z "$APK_PATH" ]; then
echo "APK_PATH not set" >&2 echo "APK_PATH not set" >&2
@@ -126,8 +143,20 @@ jobs:
exit 1 exit 1
fi fi
UPLOAD_URL="$API_BASE/repos/$OWNER/$REPO_NAME/releases/$RELEASE_ID/assets?name=$(basename $APK_PATH)" # Tworzymy ładną nazwę dla pliku
echo "Uploading $APK_PATH to $UPLOAD_URL" FRIENDLY_NAME="Matma-${TAG}.apk"
cp "$APK_PATH" "./$FRIENDLY_NAME"
curl --fail -H "Authorization: token $GITEA_TOKEN" -H "Content-Type: application/octet-stream" \ UPLOAD_URL="$API_BASE/repos/$OWNER/$REPO_NAME/releases/$RELEASE_ID/assets?name=$FRIENDLY_NAME"
--data-binary @"$APK_PATH" "$UPLOAD_URL" echo "Uploading $FRIENDLY_NAME to $UPLOAD_URL"
curl --fail -s -H "Authorization: token $GITEA_TOKEN" \
-H "Content-Type: application/octet-stream" \
--data-binary @"./$FRIENDLY_NAME" \
"$UPLOAD_URL"
# Dodanie bezpośredniego linku do podsumowania buildu w Gitea
DOWNLOAD_URL="${SERVER_CLEAN}/${OWNER}/${REPO_NAME}/releases/download/${TAG}/${FRIENDLY_NAME}"
echo "### ✅ APK gotowy do pobrania!" >> $GITHUB_STEP_SUMMARY
echo "[Pobierz plik $FRIENDLY_NAME]($DOWNLOAD_URL)" >> $GITHUB_STEP_SUMMARY
echo "Adres: $DOWNLOAD_URL" >> $GITHUB_STEP_SUMMARY
+8
View File
@@ -52,9 +52,17 @@
</div> </div>
<div id="footer-placeholder"></div> <div id="footer-placeholder"></div>
<header class="app-header">
<button id="back-btn" class="app-nav-btn">← Menu</button>
<div class="header-title">Nauka Czytania</div>
</header>
<footer class="app-footer" style="text-align: center; padding: 1rem; font-size: 0.8rem; color: #64748b;">
Wersja: <span id="app-version">...</span>
</footer>
<script src="js/nav.js?v=20260521"></script> <script src="js/nav.js?v=20260521"></script>
<script src="js/czytanie.js?v=20260524"></script> <script src="js/czytanie.js?v=20260524"></script>
<script src="js/components.js"></script> <script src="js/components.js"></script>
<script src="js/version.js"></script>
<script> <script>
// Ładowanie nagłówka i stopki // Ładowanie nagłówka i stopki
loadComponent('components/header.html', { loadComponent('components/header.html', {
+4
View File
@@ -59,9 +59,13 @@
</div> </div>
<div id="footer-placeholder"></div> <div id="footer-placeholder"></div>
<footer class="app-footer" style="text-align: center; padding: 1rem; font-size: 0.8rem; color: #64748b;">
Wersja: <span id="app-version">...</span>
</footer>
<script src="js/nav.js?v=20260521"></script> <script src="js/nav.js?v=20260521"></script>
<script src="js/dyktando.js?v=20260524"></script> <script src="js/dyktando.js?v=20260524"></script>
<script src="js/components.js"></script> <script src="js/components.js"></script>
<script src="js/version.js"></script>
<script> <script>
loadComponent('components/header.html', { loadComponent('components/header.html', {
'{TITLE}': '✏️ Dyktando', '{TITLE}': '✏️ Dyktando',
+4
View File
@@ -95,9 +95,13 @@
</div> </div>
<div id="footer-placeholder"></div> <div id="footer-placeholder"></div>
<footer class="app-footer" style="text-align: center; padding: 1rem; font-size: 0.8rem; color: #64748b;">
Wersja: <span id="app-version">...</span>
</footer>
<script src="js/nav.js?v=20260521"></script> <script src="js/nav.js?v=20260521"></script>
<script src="js/dzielenie.js?v=20260524"></script> <script src="js/dzielenie.js?v=20260524"></script>
<script src="js/components.js"></script> <script src="js/components.js"></script>
<script src="js/version.js"></script>
<script> <script>
loadComponent('components/header.html', { loadComponent('components/header.html', {
'{TITLE}': '÷ Nauka Dzielenia', '{TITLE}': '÷ Nauka Dzielenia',
+4
View File
@@ -95,9 +95,13 @@
</div> </div>
<div id="footer-placeholder"></div> <div id="footer-placeholder"></div>
<footer class="app-footer" style="text-align: center; padding: 1rem; font-size: 0.8rem; color: #64748b;">
Wersja: <span id="app-version">...</span>
</footer>
<script src="js/nav.js?v=20260521"></script> <script src="js/nav.js?v=20260521"></script>
<script src="js/mnozenie.js?v=20260524"></script> <script src="js/mnozenie.js?v=20260524"></script>
<script src="js/components.js"></script> <script src="js/components.js"></script>
<script src="js/version.js"></script>
<script> <script>
loadComponent('components/header.html', { loadComponent('components/header.html', {
'{TITLE}': '× Nauka Mnożenia', '{TITLE}': '× Nauka Mnożenia',
+3
View File
@@ -148,6 +148,9 @@
</div> </div>
<div id="footer-placeholder"></div> <div id="footer-placeholder"></div>
<footer class="app-footer" style="text-align: center; padding: 1rem; font-size: 0.8rem; color: #64748b;">
Wersja: <span id="app-version">...</span>
</footer>
<script src="js/version.js?v=20260521" defer></script> <script src="js/version.js?v=20260521" defer></script>
<script src="js/nav.js?v=20260521"></script> <script src="js/nav.js?v=20260521"></script>
<script src="js/app.js?v=20260524"></script> <script src="js/app.js?v=20260524"></script>