This commit is contained in:
Bryan Gerlach
2024-10-09 21:13:05 -05:00
parent 57f72c556a
commit cec28f8281
2 changed files with 169 additions and 130 deletions

View File

@@ -28,15 +28,15 @@ on:
required: true required: true
default: '' default: ''
type: string type: string
iconbase64: iconlink:
description: "icon in base64" description: "icon link"
required: false required: false
default: '' default: 'false'
type: string type: string
logobase64: logolink:
description: "logo in base64" description: "logo link"
required: false required: false
default: '' default: 'false'
type: string type: string
appname: appname:
description: "app name" description: "app name"
@@ -71,7 +71,7 @@ env:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
# vcpkg version: 2024.07.12 # vcpkg version: 2024.07.12
VCPKG_COMMIT_ID: "1de2026f28ead93ff1773e6e680387643e914ea1" VCPKG_COMMIT_ID: "1de2026f28ead93ff1773e6e680387643e914ea1"
VERSION: "1.3.1" VERSION: "${{ fromJson(inputs.extras).version }}"
NDK_VERSION: "r27" NDK_VERSION: "r27"
#signing keys env variable checks #signing keys env variable checks
ANDROID_SIGNING_KEY: "${{ secrets.ANDROID_SIGNING_KEY }}" ANDROID_SIGNING_KEY: "${{ secrets.ANDROID_SIGNING_KEY }}"
@@ -94,7 +94,7 @@ jobs:
build-rustdesk-android: build-rustdesk-android:
needs: [generate-bridge-linux] needs: [generate-bridge-linux]
name: build rustdesk android apk ${{ matrix.job.target }} name: build rustdesk android apk ${{ matrix.job.target }}
runs-on: [self-hosted, linux] runs-on: ubuntu-20.04
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@@ -121,16 +121,16 @@ jobs:
# suffix: "", # suffix: "",
# } # }
steps: steps:
# - name: Free Disk Space (Ubuntu) - name: Free Disk Space (Ubuntu)
# uses: jlumbroso/free-disk-space@main uses: jlumbroso/free-disk-space@main
# with: with:
# tool-cache: false tool-cache: false
# android: false android: false
# dotnet: true dotnet: true
# haskell: true haskell: true
# large-packages: false large-packages: false
# docker-images: true docker-images: true
# swap-storage: false swap-storage: false
- name: Export GitHub Actions cache environment variables - name: Export GitHub Actions cache environment variables
uses: actions/github-script@v6 uses: actions/github-script@v6
@@ -139,52 +139,53 @@ jobs:
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
# - name: Install dependencies - name: Install dependencies
# run: | run: |
# echo ${{ secrets.SUDOPW }} | sudo -S apt-get update sudo apt-get update
# echo ${{ secrets.SUDOPW }} | sudo -S apt-get install -y \ sudo apt-get install -y \
# clang \ clang \
# cmake \ cmake \
# curl \ curl \
# gcc-multilib \ gcc-multilib \
# git \ git \
# g++ \ g++ \
# g++-multilib \ g++-multilib \
# imagemagick \ imagemagick \
# libappindicator3-dev \ libappindicator3-dev \
# libasound2-dev \ libasound2-dev \
# libc6-dev \ libc6-dev \
# libclang-10-dev \ libclang-10-dev \
# libgstreamer1.0-dev \ libgstreamer1.0-dev \
# libgstreamer-plugins-base1.0-dev \ libgstreamer-plugins-base1.0-dev \
# libgtk-3-dev \ libgtk-3-dev \
# libpam0g-dev \ libpam0g-dev \
# libpulse-dev \ libpulse-dev \
# libva-dev \ libva-dev \
# libvdpau-dev \ libvdpau-dev \
# libxcb-randr0-dev \ libxcb-randr0-dev \
# libxcb-shape0-dev \ libxcb-shape0-dev \
# libxcb-xfixes0-dev \ libxcb-xfixes0-dev \
# libxdo-dev \ libxdo-dev \
# libxfixes-dev \ libxfixes-dev \
# llvm-10-dev \ llvm-10-dev \
# nasm \ nasm \
# ninja-build \ ninja-build \
# openjdk-11-jdk-headless \ openjdk-11-jdk-headless \
# pkg-config \ pkg-config \
# tree \ tree \
# wget wget
- name: Checkout source code - name: Checkout source code
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
repository: rustdesk/rustdesk repository: rustdesk/rustdesk
ref: refs/tags/${{ env.VERSION }}
# - name: Install flutter - name: Install flutter
# uses: subosito/flutter-action@v2 uses: subosito/flutter-action@v2
# with: with:
# channel: "stable" channel: "stable"
# flutter-version: ${{ env.ANDROID_FLUTTER_VERSION }} flutter-version: ${{ env.ANDROID_FLUTTER_VERSION }}
- uses: nttld/setup-ndk@v1 - uses: nttld/setup-ndk@v1
id: setup-ndk id: setup-ndk
@@ -192,40 +193,40 @@ jobs:
ndk-version: ${{ env.NDK_VERSION }} ndk-version: ${{ env.NDK_VERSION }}
add-to-path: true add-to-path: true
# - name: Setup vcpkg with Github Actions binary cache - name: Setup vcpkg with Github Actions binary cache
# uses: lukka/run-vcpkg@v11 uses: lukka/run-vcpkg@v11
# with: with:
# vcpkgDirectory: /opt/artifacts/vcpkg vcpkgDirectory: /opt/artifacts/vcpkg
# vcpkgGitCommitId: ${{ env.VCPKG_COMMIT_ID }} vcpkgGitCommitId: ${{ env.VCPKG_COMMIT_ID }}
# doNotCache: false doNotCache: false
# - name: Install vcpkg dependencies - name: Install vcpkg dependencies
# run: | run: |
# #case ${{ matrix.job.target }} in #case ${{ matrix.job.target }} in
# # aarch64-linux-android) # aarch64-linux-android)
# ANDROID_TARGET=arm64-v8a ANDROID_TARGET=arm64-v8a
# # ;; # ;;
# # armv7-linux-androideabi) # armv7-linux-androideabi)
# # ANDROID_TARGET=armeabi-v7a # ANDROID_TARGET=armeabi-v7a
# # ;; # ;;
# # x86_64-linux-android) # x86_64-linux-android)
# # ANDROID_TARGET=x86_64 # ANDROID_TARGET=x86_64
# # ;; # ;;
# # i686-linux-android) # i686-linux-android)
# # ANDROID_TARGET=x86 # ANDROID_TARGET=x86
# # ;; # ;;
# # esac # esac
# if ! ./flutter/build_android_deps.sh "${ANDROID_TARGET}"; then if ! ./flutter/build_android_deps.sh "${ANDROID_TARGET}"; then
# find "${VCPKG_ROOT}/" -name "*.log" | while read -r _1; do find "${VCPKG_ROOT}/" -name "*.log" | while read -r _1; do
# echo "$_1:" echo "$_1:"
# echo "======" echo "======"
# cat "$_1" cat "$_1"
# echo "======" echo "======"
# echo "" echo ""
# done done
# exit 1 exit 1
# fi fi
# shell: bash shell: bash
- name: Restore bridge files - name: Restore bridge files
uses: actions/download-artifact@master uses: actions/download-artifact@master
@@ -233,16 +234,16 @@ jobs:
name: bridge-artifact name: bridge-artifact
path: ./ path: ./
# - name: Install Rust toolchain - name: Install Rust toolchain
# uses: dtolnay/rust-toolchain@v1 uses: dtolnay/rust-toolchain@v1
# with: with:
# toolchain: ${{ env.RUST_VERSION }} toolchain: ${{ env.RUST_VERSION }}
# components: "rustfmt" components: "rustfmt"
# - uses: Swatinem/rust-cache@v2 - uses: Swatinem/rust-cache@v2
# with: with:
# prefix-key: rustdesk-lib-cache-android # TODO: drop '-android' part after caches are invalidated prefix-key: rustdesk-lib-cache-android # TODO: drop '-android' part after caches are invalidated
# key: ${{ matrix.job.target }} key: ${{ matrix.job.target }}
- name: fix android for flutter 3.13 - name: fix android for flutter 3.13
if: $${{ env.ANDROID_FLUTTER_VERSION == '3.13.9' }} if: $${{ env.ANDROID_FLUTTER_VERSION == '3.13.9' }}

File diff suppressed because one or more lines are too long