Skip to content

ADFA-3269 Bugfix for release.yml #1078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hal-eisen-adfa merged 1 commit into from
Mar 13, 2026
Merged

ADFA-3269 Bugfix for release.yml #1078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,17 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
ref: main

- name: Verify Telegram token
env:
TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_TOKEN }}
run: |
if [ -z "${TELEGRAM_TOKEN}" ]; then
echo "ERROR: TELEGRAM_TOKEN is not set or is empty"
exit 1
fi
echo "TELEGRAM_TOKEN length: ${#TELEGRAM_TOKEN}"
echo "TELEGRAM_TOKEN (first 3 and last 3 chars): ${TELEGRAM_TOKEN:0:3}...${TELEGRAM_TOKEN: -3}"

- name: Set branch to main for build
id: determine_branch
run: |
Expand Down Expand Up @@ -591,7 +602,7 @@ jobs:
CLOUDFLARE_KEY_ID: ${{ vars.CLOUDFLARE_KEY_ID }}
CLOUDFLARE_SECRET_ACCESS_KEY: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }}
run: |
uv run --with boto3 scripts/cloudflare-r2-upload.py "${{ steps.find_apk.outputs.APK_PATH }}" "${{ matrix.variant }}"
uv run --with boto3 scripts/cloudflare-r2-upload.py "${{ steps.find_apk.outputs.APK_PATH }}"

- name: Clean up build folder after upload
run: |
Expand Down Expand Up @@ -696,18 +707,16 @@ jobs:
TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_TOKEN }}
TELEGRAM_EARLY_ACCESS_CHAT_ID: ${{ vars.TELEGRAM_EARLY_ACCESS_CHAT_ID }}
APK_PATH: ${{ steps.find_apk.outputs.APK_PATH }}
VARIANT: ${{ matrix.variant }}
run: |
GIT_LOG=$(git log --oneline --since "24 hours ago" || true)
if [ -z "$GIT_LOG" ]; then
GIT_LOG="(no commits in the last 24 hours)"
fi
APK_BASENAME=$(basename "$APK_PATH")
APK_FILENAME="${APK_BASENAME%.*}-${VARIANT}.${APK_BASENAME##*.}"
APK_FILENAME=$(basename "$APK_PATH")
DOWNLOAD_URL="https://download.appdevforall.org/${APK_FILENAME}"
MESSAGE=$( printf "Download: %s\n\n%s" "$DOWNLOAD_URL" "$GIT_LOG" )
# Telegram message limit 4096; use first 4096 chars
MESSAGE=$(printf "Download: %s\n\n%s" "$DOWNLOAD_URL" "$GIT_LOG")
MESSAGE="${MESSAGE:0:4096}"
printf '%s' "$MESSAGE" | od -c
curl -s -X POST -H "Content-Type: application/json" \
-d "$(jq -n --arg chat_id "$TELEGRAM_EARLY_ACCESS_CHAT_ID" --arg text "$MESSAGE" '{chat_id: $chat_id, text: $text}')" \
"https://api.telegram.org/bot${TELEGRAM_TOKEN}/sendMessage"
Expand Down
10 changes: 3 additions & 7 deletions scripts/cloudflare-r2-upload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,13 @@
config=config,
)

if len(sys.argv) < 3:
print("Usage: cloudflare-r2-upload.py <file_path> <variant>", file=sys.stderr)
if len(sys.argv) < 2:
print("Usage: cloudflare-r2-upload.py <file_path>", file=sys.stderr)
sys.exit(1)

file_path = sys.argv[1]
variant = sys.argv[2]
file_size = os.path.getsize(file_path)
base_name = os.path.basename(file_path)
# Inject variant into filename before .apk so v7 and v8 upload to distinct R2 keys
name_root, ext = os.path.splitext(base_name)
file_name = f"{name_root}-{variant}{ext}"
file_name = os.path.basename(file_path)

extra_args = {}
if file_name.lower().endswith(".apk"):
Expand Down
Loading