mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 19:38:52 +01:00
Update deploy system
This commit is contained in:
@@ -1,13 +1,10 @@
|
||||
name: Bump + Release + F-Droid
|
||||
name: Bump Version & Prepare F-Droid Release
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
tags:
|
||||
- "v*"
|
||||
|
||||
jobs:
|
||||
release:
|
||||
bump:
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
META_YML: fdroid/metadata/dev.octoshrimpy.quik.yml
|
||||
@@ -15,109 +12,92 @@ jobs:
|
||||
CHANGELOG: data/src/main/assets/changelog.json
|
||||
|
||||
steps:
|
||||
# 1) Checkout full history so tags are available
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
persist-credentials: true
|
||||
- name: Checkout full history
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
persist-credentials: true
|
||||
|
||||
# 2) Decode your signing keystore from the secret
|
||||
- name: Decode Android keystore
|
||||
run: |
|
||||
echo "${{ secrets.KEYSTORE_FILE }}" | base64 --decode > keystore.p12
|
||||
- name: Decode Android keystore
|
||||
run: |
|
||||
echo "${{ secrets.KEYSTORE_FILE }}" | base64 --decode > keystore.p12
|
||||
|
||||
# 3) Ensure your repo icon is in the right place
|
||||
- name: Install repo icon
|
||||
run: |
|
||||
mkdir -p repo/icons/metadata/en-US/images
|
||||
cp metadata/en-US/images/icon.png \
|
||||
repo/icons/metadata/en-US/images/icon.png
|
||||
- name: Install repo icon
|
||||
run: |
|
||||
mkdir -p repo/icons/metadata/en-US/images
|
||||
cp metadata/en-US/images/icon.png \
|
||||
repo/icons/metadata/en-US/images/icon.png
|
||||
|
||||
# 4) Write a lowercase-key F-Droid config.yml from secrets
|
||||
- name: Write F-Droid config.yml
|
||||
run: |
|
||||
cat > config.yml <<EOF
|
||||
repo_keystore: keystore.p12
|
||||
keystorepass: ${{ secrets.KEYSTORE_PASSWORD }}
|
||||
repo_keyalias: ${{ secrets.KEY_ALIAS }}
|
||||
keypass: ${{ secrets.KEY_PASSWORD }}
|
||||
repo_icon: metadata/en-US/images/icon.png
|
||||
EOF
|
||||
- name: Write F-Droid config.yml
|
||||
run: |
|
||||
cat > config.yml <<EOF
|
||||
repo_keystore: keystore.p12
|
||||
keystorepass: ${{ secrets.KEYSTORE_PASSWORD }}
|
||||
repo_keyalias: ${{ secrets.KEY_ALIAS }}
|
||||
keypass: ${{ secrets.KEY_PASSWORD }}
|
||||
repo_icon: metadata/en-US/images/icon.png
|
||||
EOF
|
||||
|
||||
# 5) Install fdroidserver & bump metadata.yml non-interactively
|
||||
- name: Set up Python & fdroidserver
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: '3.x'
|
||||
- name: Bump F-Droid metadata
|
||||
run: |
|
||||
pip3 install fdroidserver
|
||||
fdroid update
|
||||
- name: Bump F-Droid metadata
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: '3.x'
|
||||
- run: |
|
||||
pip3 install fdroidserver
|
||||
fdroid update
|
||||
|
||||
# 6) Commit F-Droid metadata.yml
|
||||
- name: Commit F-Droid metadata.yml
|
||||
run: |
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
||||
git add "$META_YML"
|
||||
git diff --quiet --cached || git commit -m "chore: bump F-Droid metadata"
|
||||
- name: Commit F-Droid metadata bump
|
||||
run: |
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
||||
git add "$META_YML"
|
||||
git diff --quiet --cached || git commit -m "chore: bump F-Droid metadata"
|
||||
|
||||
# 7) Set up Java & jq for the rest
|
||||
- name: Set up Java 17
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
distribution: temurin
|
||||
java-version: '17'
|
||||
- name: Install jq
|
||||
run: sudo apt-get update && sudo apt-get install -y jq
|
||||
- name: Set up Java & jq
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
distribution: temurin
|
||||
java-version: '17'
|
||||
- run: sudo apt-get update && sudo apt-get install -y jq
|
||||
|
||||
# 8) Bump Android versions & capture NEW_CODE/NEW_NAME
|
||||
- name: Bump Android version & update build.gradle
|
||||
id: bump
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
current_code=$(grep -E '^[[:space:]]*versionCode ' "$GRADLE_FILE" | awk '{print $2}')
|
||||
current_name=$(grep -E '^[[:space:]]*versionName ' "$GRADLE_FILE" \
|
||||
| grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')
|
||||
new_code=$((current_code + 1))
|
||||
IFS='.' read -r major minor patch <<< "$current_name"
|
||||
new_name="${major}.$((minor + 1)).0"
|
||||
sed -i \
|
||||
-e "s|^[[:space:]]*versionCode[[:space:]]\+$current_code|versionCode $new_code|" \
|
||||
-e "s|^[[:space:]]*versionName[[:space:]]\+'$current_name'|versionName '$new_name'|" \
|
||||
"$GRADLE_FILE"
|
||||
echo "NEW_CODE=$new_code" >> "$GITHUB_ENV"
|
||||
echo "NEW_NAME=$new_name" >> "$GITHUB_ENV"
|
||||
echo "✅ Bumped to versionCode $new_code, versionName $new_name"
|
||||
|
||||
# 9) Gather commits & prepend to changelog.json
|
||||
- name: Update changelog.json & write F-Droid txt
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
prev_tag="v${NEW_NAME}"
|
||||
if git rev-parse --verify --quiet "$prev_tag" >/dev/null; then
|
||||
base="$prev_tag"
|
||||
else
|
||||
base=$(git describe --tags --match "v[0-9]*" --abbrev=0 2>/dev/null || echo "")
|
||||
fi
|
||||
[[ -n "$base" ]] && range="$base..HEAD" || range="HEAD"
|
||||
mapfile -t commits < <(
|
||||
git log --no-merges --reverse --pretty=format:"%s by %an" $range \
|
||||
| sed -E 's/[[:space:]]*\.*[[:space:]]+by/ by/' \
|
||||
| sed -E 's/^[[:space:]]+//; s/[[:space:]]+$//' \
|
||||
| awk '!seen[$0]++'
|
||||
)
|
||||
if (( ${#commits[@]} )); then
|
||||
changes_json=$(printf '%s\n' "${commits[@]}" | jq -R . | jq -s .)
|
||||
else
|
||||
changes_json="[]"
|
||||
fi
|
||||
jq --argjson changes "$changes_json" \
|
||||
--arg vc "$NEW_CODE" \
|
||||
--arg vn "$NEW_NAME" \
|
||||
'
|
||||
- name: Bump Android version & changelog
|
||||
id: bump
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
# extract current values
|
||||
current_code=$(grep -E '^[[:space:]]*versionCode ' "$GRADLE_FILE" | awk '{print $2}')
|
||||
current_name=$(grep -E 'versionName' "$GRADLE_FILE" | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')
|
||||
# bump
|
||||
new_code=$((current_code + 1))
|
||||
IFS='.' read -r major minor patch <<< "$current_name"
|
||||
new_name="${major}.$((minor + 1)).0"
|
||||
# apply to build.gradle
|
||||
sed -i \
|
||||
-e "s|^[[:space:]]*versionCode[[:space:]]\+$current_code|versionCode $new_code|" \
|
||||
-e "s|versionName[[:space:]]\+'$current_name'|versionName '$new_name'|" \
|
||||
"$GRADLE_FILE"
|
||||
echo "NEW_CODE=$new_code" >> "$GITHUB_ENV"
|
||||
echo "NEW_NAME=$new_name" >> "$GITHUB_ENV"
|
||||
# prepend to changelog.json
|
||||
prev_tag="v${new_name}"
|
||||
if git rev-parse --verify --quiet "$prev_tag" >/dev/null; then
|
||||
base="$prev_tag"
|
||||
else
|
||||
base=$(git describe --tags --match "v[0-9]*" --abbrev=0 2>/dev/null || echo "")
|
||||
fi
|
||||
[[ -n "$base" ]] && range="$base..HEAD" || range="HEAD"
|
||||
mapfile -t commits < <(
|
||||
git log --no-merges --reverse --pretty=format:"%s by %an" $range \
|
||||
| sed -E 's/[[:space:]]*\.*[[:space:]]+by/ by/' \
|
||||
| sed -E 's/^[[:space:]]+//;s/[[:space:]]+$//' \
|
||||
| awk '!seen[$0]++'
|
||||
)
|
||||
changes_json=$(printf '%s\n' "${commits[@]:-}" | jq -R . | jq -s .)
|
||||
jq --argjson changes "$changes_json" \
|
||||
--arg vc "$new_code" \
|
||||
--arg vn "$new_name" \
|
||||
'
|
||||
def capfirst: sub("^(.)"; "\(ascii_upcase(.1))");
|
||||
$all := ($changes | map(capfirst));
|
||||
$fixes := $all | map(select(test("^(Fix|fix)")));
|
||||
@@ -128,77 +108,34 @@ jobs:
|
||||
fixes: $fixes,
|
||||
changes: $others
|
||||
}] + .
|
||||
' \
|
||||
"$CHANGELOG" > tmp && mv tmp "$CHANGELOG"
|
||||
mkdir -p fdroid/metadata
|
||||
out="fdroid/metadata/${NEW_CODE}.txt"
|
||||
{
|
||||
echo "Changes in ${NEW_NAME} (${NEW_CODE}):"
|
||||
echo
|
||||
for c in "${commits[@]}"; do echo "- $c"; done
|
||||
} > "$out"
|
||||
' "$CHANGELOG" > tmp && mv tmp "$CHANGELOG"
|
||||
# write F-Droid .txt summary
|
||||
mkdir -p fdroid/metadata
|
||||
{
|
||||
echo "Changes in $new_name ($new_code):"
|
||||
echo
|
||||
for c in "${commits[@]}"; do echo "- $c"; done
|
||||
} > fdroid/metadata/"${new_code}".txt
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
||||
git add "$GRADLE_FILE" "$CHANGELOG" "fdroid/metadata/${new_code}.txt"
|
||||
git commit -m "chore: bump to $new_name ($new_code)"
|
||||
|
||||
# 10) Commit version bump, changelog & metadata TXT
|
||||
- name: Commit version bump & changelog
|
||||
run: |
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
||||
git add "$GRADLE_FILE" "$CHANGELOG" fdroid/metadata/"${NEW_CODE}".txt
|
||||
git diff --quiet --cached || git commit -m "chore: bump to ${NEW_NAME} (${NEW_CODE})"
|
||||
- name: Push bump branch
|
||||
run: |
|
||||
git checkout -b bump/${{ env.NEW_NAME }}-${{ env.NEW_CODE }}
|
||||
git push --set-upstream origin bump/${{ env.NEW_NAME }}-${{ env.NEW_CODE }}
|
||||
|
||||
# 11) Push bump branch instead of master
|
||||
- name: Push bump branch
|
||||
run: |
|
||||
git checkout -b bump/${NEW_NAME}-${NEW_CODE}
|
||||
git push --set-upstream origin bump/${NEW_NAME}-${NEW_CODE}
|
||||
|
||||
# 12) Create & auto-merge PR
|
||||
- name: Create & auto-merge PR
|
||||
uses: peter-evans/create-pull-request@v5
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
commit-message: "chore: bump to ${NEW_NAME} (${NEW_CODE})"
|
||||
title: "chore: bump to ${NEW_NAME} (${NEW_CODE})"
|
||||
body: |
|
||||
This PR bumps:
|
||||
- versionCode → ${NEW_CODE}
|
||||
- versionName → ${NEW_NAME}
|
||||
branch: bump/${NEW_NAME}-${NEW_CODE}
|
||||
base: master
|
||||
labels: automated
|
||||
merge-method: merge
|
||||
auto-merge: true
|
||||
|
||||
# 13) Build the APK (using the same keystore.p12)
|
||||
- name: Build release APK
|
||||
run: |
|
||||
chmod +x ./gradlew
|
||||
./gradlew clean :presentation:assembleRelease \
|
||||
-Pandroid.injected.signing.store.file=keystore.p12 \
|
||||
-Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} \
|
||||
-Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \
|
||||
-Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }}
|
||||
|
||||
# 14) Tag & push tag (on master after auto-merge)
|
||||
- name: Tag new release
|
||||
run: |
|
||||
git fetch origin master
|
||||
git checkout master
|
||||
git pull
|
||||
git tag "v${NEW_NAME}"
|
||||
git push origin "v${NEW_NAME}"
|
||||
|
||||
# 15) Publish GitHub Release & upload APK
|
||||
- name: Publish GitHub Release
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
tag_name: "v${NEW_NAME}"
|
||||
files: presentation/build/outputs/apk/release/*-release.apk
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
# 16) Cleanup signing material
|
||||
- name: Cleanup keystore/config
|
||||
if: always()
|
||||
run: |
|
||||
shred --remove keystore.p12 config.yml
|
||||
- name: Open PR (no auto-merge)
|
||||
uses: peter-evans/create-pull-request@v5
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
commit-message: "chore: bump to ${{ env.NEW_NAME }} (${{ env.NEW_CODE }})"
|
||||
title: "chore: bump to ${{ env.NEW_NAME }} (${{ env.NEW_CODE }})"
|
||||
body: |
|
||||
This PR bumps:
|
||||
- versionCode → ${{ env.NEW_CODE }}
|
||||
- versionName → ${{ env.NEW_NAME }}
|
||||
branch: bump/${{ env.NEW_NAME }}-${{ env.NEW_CODE }}
|
||||
base: master
|
||||
labels: automated
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
name: Deploy APK from master
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
build-and-publish:
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
GRADLE_FILE: presentation/build.gradle
|
||||
|
||||
steps:
|
||||
- name: Checkout master
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
ref: master
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Set up Java 17
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
distribution: temurin
|
||||
java-version: '17'
|
||||
|
||||
- name: Decode Android keystore
|
||||
run: echo "${{ secrets.KEYSTORE_FILE }}" \
|
||||
| base64 --decode > keystore.p12
|
||||
|
||||
- name: Build release APK
|
||||
run: |
|
||||
chmod +x ./gradlew
|
||||
./gradlew clean :presentation:assembleRelease \
|
||||
-Pandroid.injected.signing.store.file=keystore.p12 \
|
||||
-Pandroid.injected.signing.store.password=${{ secrets.KEYSTORE_PASSWORD }} \
|
||||
-Pandroid.injected.signing.key.alias=${{ secrets.KEY_ALIAS }} \
|
||||
-Pandroid.injected.signing.key.password=${{ secrets.KEY_PASSWORD }}
|
||||
|
||||
- name: Publish GitHub Release
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
tag_name: "v$(grep versionName ${{ env.GRADLE_FILE }} \
|
||||
| grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')"
|
||||
files: presentation/build/outputs/apk/release/*-release.apk
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
Reference in New Issue
Block a user