This commit is contained in:
Bryan Gerlach
2024-10-07 15:20:44 -05:00
parent 98fb105f28
commit 3691c06e55
5 changed files with 15 additions and 5 deletions

View File

@@ -70,7 +70,7 @@ env:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
# vcpkg version: 2024.07.12
VCPKG_COMMIT_ID: "1de2026f28ead93ff1773e6e680387643e914ea1"
VERSION: "1.3.1"
VERSION: ${{ fromJson(inputs.extras).version }}
NDK_VERSION: "r27"
#signing keys env variable checks
ANDROID_SIGNING_KEY: "${{ secrets.ANDROID_SIGNING_KEY }}"
@@ -141,6 +141,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: rustdesk/rustdesk
ref: refs/tags/${{ env.VERSION }}
- name: Set Swap Space
if: ${{ matrix.job.arch == 'x86_64' }}
@@ -289,8 +290,8 @@ jobs:
- name: icon stuff
continue-on-error: true
run: |
mv ./rustdesk/data/flutter_assets/assets/icon.svg ./rustdesk/data/flutter_assets/assets/icon.svg.bak
magick ./res/icon.png ./rustdesk/data/flutter_assets/assets/icon.svg
#mv ./rustdesk/data/flutter_assets/assets/icon.svg ./rustdesk/data/flutter_assets/assets/icon.svg.bak
convert ./res/icon.png ./rustdesk/data/flutter_assets/assets/icon.svg
- uses: rustdesk-org/run-on-arch-action@amd64-support
name: Build rustdesk
@@ -420,6 +421,10 @@ jobs:
chmod 777 output -R
export CARGO_INCREMENTAL=0
export DEB_ARCH=${{ matrix.job.deb_arch }}
echo "$(ls)"
echo "${{ inputs.logobase64 }}" | base64 -d > ./rustdesk/data/flutter_assets/assets/logo.png
mv ./rustdesk/data/flutter_assets/assets/icon.svg ./rustdesk/data/flutter_assets/assets/icon.svg.bak
convert ./res/icon.png ./rustdesk/data/flutter_assets/assets/icon.svg
pushd ./flutter
flutter pub run flutter_launcher_icons
popd

View File

@@ -71,7 +71,7 @@ env:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
# vcpkg version: 2024.07.12
VCPKG_COMMIT_ID: "1de2026f28ead93ff1773e6e680387643e914ea1"
VERSION: "1.3.1"
VERSION: ${{ fromJson(inputs.extras).version }}
NDK_VERSION: "r27"
#signing keys env variable checks
ANDROID_SIGNING_KEY: "${{ secrets.ANDROID_SIGNING_KEY }}"
@@ -135,7 +135,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: rustdesk/rustdesk
ref: refs/tags/1.3.1
ref: refs/tags/${{ env.VERSION }}
# - name: Install LLVM and Clang
# uses: KyleMayes/install-llvm-action@v1