Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
47ca253d6a | ||
|
|
766b37321d | ||
|
|
83a3ee68a8 | ||
|
|
0c8eb783a5 | ||
|
|
91ea47f63a | ||
|
|
8f4ab2783e | ||
|
|
72838d3448 |
@@ -0,0 +1,120 @@
|
||||
# Требуемые секреты репозитория (Settings → Actions → Secrets):
|
||||
# ANDROID_KEYSTORE — содержимое .jks файла (base64-кодированное)
|
||||
# ANDROID_KEYSTORE_PASSWORD
|
||||
# ANDROID_KEY_ALIAS
|
||||
# ANDROID_KEY_PASSWORD
|
||||
|
||||
name: Release APK
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
release_notes:
|
||||
description: 'Текст описания релиза (Markdown), можно оставить пустым'
|
||||
required: false
|
||||
default: ''
|
||||
type: string
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: read
|
||||
releases: write
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Set up JDK 17
|
||||
# Ставим JDK вручную и явно прописываем JAVA_HOME.
|
||||
# actions/setup-java не всегда передаёт JAVA_HOME дальше в Gitea Actions.
|
||||
run: |
|
||||
apt-get update
|
||||
apt-get install -y openjdk-17-jdk-headless unzip wget
|
||||
echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64" >> "$GITHUB_ENV"
|
||||
|
||||
- name: Install Android SDK
|
||||
# Устанавливаем command-line tools и нужные компоненты SDK,
|
||||
# затем прописываем ANDROID_HOME (читается Gradle/AGP).
|
||||
run: |
|
||||
set -euxo pipefail
|
||||
echo "ANDROID_HOME=/opt/android-sdk" >> "$GITHUB_ENV"
|
||||
mkdir -p /opt/android-sdk/cmdline-tools
|
||||
wget -q https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -O /tmp/clt.zip
|
||||
unzip -q /tmp/clt.zip -d /tmp/clt
|
||||
mv /tmp/clt/cmdline-tools /opt/android-sdk/cmdline-tools/latest
|
||||
yes | /opt/android-sdk/cmdline-tools/latest/bin/sdkmanager --licenses >/dev/null 2>&1 || true
|
||||
/opt/android-sdk/cmdline-tools/latest/bin/sdkmanager \
|
||||
"platform-tools" \
|
||||
"platforms;android-36.1" \
|
||||
"build-tools;36.1.0"
|
||||
|
||||
- name: Grant execute permission for gradlew
|
||||
run: |
|
||||
chmod +x gradlew
|
||||
java -version
|
||||
|
||||
# Версия по дате (ГГГГ.ММ.ДД), при совпадении тега добавляем уникальный суффикс.
|
||||
- name: Generate version from date
|
||||
id: version
|
||||
run: |
|
||||
BASE="$(date +%Y.%m.%d)"
|
||||
TAG="v$BASE"
|
||||
SUFFIX=0
|
||||
while git ls-remote --tags origin "$TAG" 2>/dev/null | grep -q "$TAG"; do
|
||||
SUFFIX=$((SUFFIX + 1))
|
||||
TAG="v${BASE}.${SUFFIX}"
|
||||
done
|
||||
echo "version_name=$BASE" >> "$GITHUB_OUTPUT"
|
||||
echo "version_tag=$TAG" >> "$GITHUB_OUTPUT"
|
||||
echo "Generated version: $BASE (tag: $TAG)"
|
||||
|
||||
- name: Restore keystore from secret
|
||||
# Ключ подписи передаётся как base64-секрет и декодируется в файл.
|
||||
run: |
|
||||
if [ -n "$ANDROID_KEYSTORE" ]; then
|
||||
echo "$ANDROID_KEYSTORE" | base64 -d > keystore.jks
|
||||
echo "keystore restored"
|
||||
else
|
||||
echo "::warning::ANDROID_KEYSTORE not set, building unsigned release"
|
||||
fi
|
||||
env:
|
||||
ANDROID_KEYSTORE: ${{ secrets.ANDROID_KEYSTORE }}
|
||||
|
||||
- name: Build release APK
|
||||
run: ./gradlew assembleRelease
|
||||
env:
|
||||
# Переменные окружения, которые читает signingConfig в app/build.gradle.kts
|
||||
ANDROID_KEYSTORE_PATH: ${{ github.workspace }}/keystore.jks
|
||||
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
|
||||
ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
|
||||
ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
|
||||
ORG_GRADLE_JVMARGS: '-Xmx2048m'
|
||||
GRADLE_OPTS: '-Dorg.gradle.daemon=false'
|
||||
|
||||
- name: Determine APK path
|
||||
id: apk
|
||||
run: |
|
||||
APK=$(find app/build/outputs/apk/release -name "*.apk" ! -name "*unsigned*" ! -name "*unaligned*" | head -n 1)
|
||||
if [ -z "$APK" ]; then
|
||||
APK=$(find app/build/outputs/apk/release -name "*.apk" | head -n 1)
|
||||
fi
|
||||
echo "apk_path=$APK" >> "$GITHUB_OUTPUT"
|
||||
echo "APK path: $APK"
|
||||
|
||||
- name: Create Gitea Release
|
||||
uses: https://gitea.com/actions/gitea-release-action@v1
|
||||
with:
|
||||
tag_name: ${{ steps.version.outputs.version_tag }}
|
||||
name: ${{ steps.version.outputs.version_name }}
|
||||
body: ${{ github.event.inputs.release_notes }}
|
||||
files: ${{ steps.apk.outputs.apk_path }}
|
||||
token: ${{ secrets.GITEA_TOKEN }}
|
||||
server_url: ${{ gitea.server_url }}
|
||||
|
||||
- name: Upload APK as artifact
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: vyatsu-schedule-${{ steps.version.outputs.version_name }}
|
||||
path: ${{ steps.apk.outputs.apk_path }}
|
||||
@@ -17,3 +17,10 @@ local.properties
|
||||
|
||||
/app/build
|
||||
/app/release
|
||||
/.idea
|
||||
|
||||
# Keystore подписи и его base64-представление для Gitea-секрета
|
||||
*.jks
|
||||
*.keystore
|
||||
/scripts/.keystore.b64
|
||||
.keystore.b64
|
||||
|
||||
@@ -22,6 +22,20 @@ android {
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
// Релизная подпись, ключ и пароли читаются из переменных окружения
|
||||
// release-сборка не подписывается
|
||||
signingConfigs {
|
||||
create("release") {
|
||||
val storePath = System.getenv("ANDROID_KEYSTORE_PATH")
|
||||
if (!storePath.isNullOrBlank()) {
|
||||
storeFile = file(storePath)
|
||||
storePassword = System.getenv("ANDROID_KEYSTORE_PASSWORD")
|
||||
keyAlias = System.getenv("ANDROID_KEY_ALIAS")
|
||||
keyPassword = System.getenv("ANDROID_KEY_PASSWORD")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
isMinifyEnabled = false
|
||||
@@ -29,6 +43,10 @@ android {
|
||||
getDefaultProguardFile("proguard-android-optimize.txt"),
|
||||
"proguard-rules.pro"
|
||||
)
|
||||
// Подпись (если есть)
|
||||
if (!System.getenv("ANDROID_KEYSTORE_PATH").isNullOrBlank()) {
|
||||
signingConfig = signingConfigs.getByName("release")
|
||||
}
|
||||
}
|
||||
}
|
||||
testOptions {
|
||||
|
||||
Executable
+32
@@ -0,0 +1,32 @@
|
||||
#!/usr/bin/env bash
|
||||
# Готовит содержимое keystore (.jks) для вставки в секрет ANDROID_KEYSTORE
|
||||
# Кодирует файл в base64 одной длинной строкой (без переносов) и сохраняет в файл .keystore.b64 рядом со скриптом.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
if [ "$#" -ne 1 ]; then
|
||||
echo "Usage: <path>" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
KEYSTORE="$1"
|
||||
|
||||
if [ ! -f "$KEYSTORE" ]; then
|
||||
echo "File not found: $KEYSTORE" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# base64 -w0: без переносов строк. (на macOS base64 не имеет -w)
|
||||
if base64 --help 2>/dev/null | grep -q '\-w'; then
|
||||
ENCODED=$(base64 -w0 "$KEYSTORE")
|
||||
else
|
||||
ENCODED=$(base64 <"$KEYSTORE" | tr -d '\n')
|
||||
fi
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
OUTFILE="$SCRIPT_DIR/.keystore.b64"
|
||||
printf '%s\n' "$ENCODED" >"$OUTFILE"
|
||||
|
||||
echo "Keystore: $KEYSTORE"
|
||||
echo "Output: $OUTFILE"
|
||||
echo "Size: ${#ENCODED} chars"
|
||||
Reference in New Issue
Block a user