forked from mirrors/rustdesk
release override enabled
This commit is contained in:
parent
12ba2d1e61
commit
30e6dc7d16
1 changed files with 55 additions and 16 deletions
71
.github/workflows/custom-android-build.yml
vendored
71
.github/workflows/custom-android-build.yml
vendored
|
|
@ -279,29 +279,26 @@ jobs:
|
||||||
env:
|
env:
|
||||||
BUILD_TOOLS_VERSION: ${{ env.ANDROID_SIGN_TOOL_VERSION }}
|
BUILD_TOOLS_VERSION: ${{ env.ANDROID_SIGN_TOOL_VERSION }}
|
||||||
|
|
||||||
- name: Copy APK to release dir
|
- name: Copy APK to artifact dir
|
||||||
if: env.UPLOAD_RELEASE == 'true'
|
if: env.UPLOAD_RELEASE == 'true'
|
||||||
shell: bash
|
shell: bash
|
||||||
env:
|
env:
|
||||||
SIGNED_RELEASE_FILE: ${{ steps.sign-rustdesk.outputs.signedReleaseFile }}
|
SIGNED_RELEASE_FILE: ${{ steps.sign-rustdesk.outputs.signedReleaseFile }}
|
||||||
run: |
|
run: |
|
||||||
mkdir -p dist/release
|
mkdir -p dist/apk
|
||||||
if [[ -n "${ANDROID_SIGNING_KEY}" ]]; then
|
if [[ -n "${ANDROID_SIGNING_KEY}" ]]; then
|
||||||
cp "${SIGNED_RELEASE_FILE}" "dist/release/rustdesk-${{ env.TAG_NAME }}-${{ matrix.job.arch }}.apk"
|
cp "${SIGNED_RELEASE_FILE}" "dist/apk/rustdesk-${{ env.TAG_NAME }}-${{ matrix.job.arch }}.apk"
|
||||||
else
|
else
|
||||||
cp "signed-apk/rustdesk-${{ env.TAG_NAME }}-${{ matrix.job.arch }}${{ matrix.job.suffix }}.apk" \
|
cp "signed-apk/rustdesk-${{ env.TAG_NAME }}-${{ matrix.job.arch }}${{ matrix.job.suffix }}.apk" \
|
||||||
"dist/release/rustdesk-${{ env.TAG_NAME }}-${{ matrix.job.arch }}.apk"
|
"dist/apk/rustdesk-${{ env.TAG_NAME }}-${{ matrix.job.arch }}.apk"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Create Release
|
- name: Upload APK for release
|
||||||
if: env.UPLOAD_RELEASE == 'true'
|
if: env.UPLOAD_RELEASE == 'true'
|
||||||
uses: actions/forgejo-release@v2.12.1
|
uses: https://code.forgejo.org/forgejo/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
direction: upload
|
name: rustdesk-apk-${{ matrix.job.arch }}
|
||||||
token: ${{ secrets.FORGEJO_TOKEN }}
|
path: dist/apk/rustdesk-${{ env.TAG_NAME }}-${{ matrix.job.arch }}.apk
|
||||||
tag: ${{ env.TAG_NAME }}
|
|
||||||
title: Release ${{ env.TAG_NAME }}
|
|
||||||
release-dir: dist/release
|
|
||||||
|
|
||||||
# -------------------------------------------------------
|
# -------------------------------------------------------
|
||||||
# Step 3: Build universal APK (all ABIs combined)
|
# Step 3: Build universal APK (all ABIs combined)
|
||||||
|
|
@ -448,22 +445,63 @@ jobs:
|
||||||
env:
|
env:
|
||||||
BUILD_TOOLS_VERSION: ${{ env.ANDROID_SIGN_TOOL_VERSION }}
|
BUILD_TOOLS_VERSION: ${{ env.ANDROID_SIGN_TOOL_VERSION }}
|
||||||
|
|
||||||
- name: Copy universal APK to release dir
|
- name: Copy universal APK to artifact dir
|
||||||
if: env.UPLOAD_RELEASE == 'true'
|
if: env.UPLOAD_RELEASE == 'true'
|
||||||
shell: bash
|
shell: bash
|
||||||
env:
|
env:
|
||||||
SIGNED_RELEASE_FILE: ${{ steps.sign-rustdesk.outputs.signedReleaseFile }}
|
SIGNED_RELEASE_FILE: ${{ steps.sign-rustdesk.outputs.signedReleaseFile }}
|
||||||
run: |
|
run: |
|
||||||
mkdir -p dist/release
|
mkdir -p dist/apk
|
||||||
if [[ -n "${ANDROID_SIGNING_KEY}" ]]; then
|
if [[ -n "${ANDROID_SIGNING_KEY}" ]]; then
|
||||||
cp "${SIGNED_RELEASE_FILE}" "dist/release/rustdesk-${{ env.TAG_NAME }}-universal.apk"
|
cp "${SIGNED_RELEASE_FILE}" "dist/apk/rustdesk-${{ env.TAG_NAME }}-universal.apk"
|
||||||
else
|
else
|
||||||
cp "signed-apk/rustdesk-${{ env.TAG_NAME }}-universal${{ env.suffix }}.apk" \
|
cp "signed-apk/rustdesk-${{ env.TAG_NAME }}-universal${{ env.suffix }}.apk" \
|
||||||
"dist/release/rustdesk-${{ env.TAG_NAME }}-universal.apk"
|
"dist/apk/rustdesk-${{ env.TAG_NAME }}-universal.apk"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Create Release
|
- name: Upload universal APK for release
|
||||||
if: env.UPLOAD_RELEASE == 'true'
|
if: env.UPLOAD_RELEASE == 'true'
|
||||||
|
uses: https://code.forgejo.org/forgejo/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: rustdesk-apk-universal
|
||||||
|
path: dist/apk/rustdesk-${{ env.TAG_NAME }}-universal.apk
|
||||||
|
|
||||||
|
# -------------------------------------------------------
|
||||||
|
# Step 4: Publish all APKs to a single Forgejo release
|
||||||
|
# Runs on: ubuntu-24.04
|
||||||
|
# Needs: build-rustdesk-android-universal (all APK artifacts ready)
|
||||||
|
# -------------------------------------------------------
|
||||||
|
publish-android-release:
|
||||||
|
needs: [build-rustdesk-android-universal]
|
||||||
|
if: ${{ inputs['upload-release'] }}
|
||||||
|
name: publish rustdesk android release
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
steps:
|
||||||
|
- name: Download arm64 APK
|
||||||
|
uses: https://code.forgejo.org/forgejo/download-artifact@v4
|
||||||
|
with:
|
||||||
|
name: rustdesk-apk-aarch64
|
||||||
|
path: dist/release
|
||||||
|
|
||||||
|
- name: Download armv7 APK
|
||||||
|
uses: https://code.forgejo.org/forgejo/download-artifact@v4
|
||||||
|
with:
|
||||||
|
name: rustdesk-apk-armv7
|
||||||
|
path: dist/release
|
||||||
|
|
||||||
|
- name: Download x86_64 APK
|
||||||
|
uses: https://code.forgejo.org/forgejo/download-artifact@v4
|
||||||
|
with:
|
||||||
|
name: rustdesk-apk-x86_64
|
||||||
|
path: dist/release
|
||||||
|
|
||||||
|
- name: Download universal APK
|
||||||
|
uses: https://code.forgejo.org/forgejo/download-artifact@v4
|
||||||
|
with:
|
||||||
|
name: rustdesk-apk-universal
|
||||||
|
path: dist/release
|
||||||
|
|
||||||
|
- name: Create Release
|
||||||
uses: actions/forgejo-release@v2.12.1
|
uses: actions/forgejo-release@v2.12.1
|
||||||
with:
|
with:
|
||||||
direction: upload
|
direction: upload
|
||||||
|
|
@ -471,3 +509,4 @@ jobs:
|
||||||
tag: ${{ env.TAG_NAME }}
|
tag: ${{ env.TAG_NAME }}
|
||||||
title: Release ${{ env.TAG_NAME }}
|
title: Release ${{ env.TAG_NAME }}
|
||||||
release-dir: dist/release
|
release-dir: dist/release
|
||||||
|
override: true
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue