Skip to content

Commit

Permalink
Add files via upload
Browse files Browse the repository at this point in the history
  • Loading branch information
@Fuechslein
Fuechslein authored Jan 23, 2025
1 parent e4f0036 commit 096df19
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 50 deletions.
92 changes: 45 additions & 47 deletions .github/workflows/flutter-build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ env:
FLUTTER_ELINUX_VERSION: "3.16.9"
TAG_NAME: "${{ inputs.upload-tag }}"
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
# vcpkg version: 2025.01.13
VCPKG_COMMIT_ID: "6f29f12e82a8293156836ad81cc9bf5af41fe836"
VERSION: "1.3.7"
# vcpkg version: 2024.11.16
VCPKG_COMMIT_ID: "b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c"
VERSION: "1.3.6"
NDK_VERSION: "r27c"
#signing keys env variable checks
ANDROID_SIGNING_KEY: "${{ secrets.ANDROID_SIGNING_KEY }}"
Expand Down Expand Up @@ -87,8 +87,6 @@ jobs:
- name: Checkout source code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Restore bridge files
uses: actions/download-artifact@master
Expand Down Expand Up @@ -254,7 +252,7 @@ jobs:
name: ${{ matrix.job.target }} (${{ matrix.job.os }})
runs-on: ${{ matrix.job.os }}
# Temporarily disable this action due to additional test is needed.
# if: false
if: false
strategy:
fail-fast: false
matrix:
Expand All @@ -278,8 +276,6 @@ jobs:
- name: Checkout source code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install LLVM and Clang
uses: rustdesk-org/install-llvm-action-32bit@master
Expand Down Expand Up @@ -408,8 +404,6 @@ jobs:
- name: Checkout source code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Restore bridge files
uses: actions/download-artifact@master
Expand Down Expand Up @@ -468,7 +462,8 @@ jobs:
rustdesk*-aarch64.dmg
build-rustdesk-ios:
if: ${{ inputs.upload-artifact }}
# if: ${{ inputs.upload-artifact }}
if: false
name: build rustdesk ios ipa
runs-on: ${{ matrix.job.os }}
needs: [generate-bridge]
Expand All @@ -495,9 +490,6 @@ jobs:
brew install nasm yasm
- name: Checkout source code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install flutter
uses: subosito/flutter-action@v2
with:
Expand Down Expand Up @@ -603,8 +595,6 @@ jobs:
- name: Checkout source code
uses: actions/checkout@v4
with:
submodules: recursive

# $VCPKG_ROOT/vcpkg install --triplet arm64-ios --x-install-root="$VCPKG_ROOT/installed"

Expand Down Expand Up @@ -677,8 +667,6 @@ jobs:
- name: Checkout source code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Import the codesign cert
if: env.MACOS_P12_BASE64 != null
Expand Down Expand Up @@ -856,7 +844,8 @@ jobs:
- build-for-macOS
- build-for-windows-flutter
runs-on: ubuntu-latest
if: ${{ inputs.upload-artifact }}
#if: ${{ inputs.upload-artifact }}
if: false
steps:
- name: Download artifacts
uses: actions/download-artifact@master
Expand Down Expand Up @@ -891,6 +880,7 @@ jobs:
needs: [generate-bridge]
name: build rustdesk android apk ${{ matrix.job.target }}
runs-on: ${{ matrix.job.os }}
if: false
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -971,9 +961,6 @@ jobs:
- name: Checkout source code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install flutter
uses: subosito/flutter-action@v2
with:
Expand Down Expand Up @@ -1043,6 +1030,16 @@ jobs:
prefix-key: rustdesk-lib-cache-android # TODO: drop '-android' part after caches are invalidated
key: ${{ matrix.job.target }}

- name: fix android for flutter 3.13
if: ${{ env.ANDROID_FLUTTER_VERSION == '3.13.9' }}
run: |
cd flutter
sed -i 's/uni_links_desktop/#uni_links_desktop/g' pubspec.yaml
sed -i 's/extended_text: .*/extended_text: 11.1.0/' pubspec.yaml
flutter pub get
cd lib
find . | grep dart | xargs sed -i 's/textScaler: TextScaler.linear(\(.*\)),/textScaleFactor: \1,/g'
- name: Build rustdesk lib
env:
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
Expand Down Expand Up @@ -1179,7 +1176,8 @@ jobs:
build-rustdesk-android-universal:
needs: [build-rustdesk-android]
name: build rustdesk android universal apk
if: ${{ inputs.upload-artifact }}
if: false
#if: ${{ inputs.upload-artifact }}
runs-on: ubuntu-20.04
env:
reltype: release
Expand Down Expand Up @@ -1240,9 +1238,6 @@ jobs:
- name: Checkout source code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Install flutter
uses: subosito/flutter-action@v2
with:
Expand Down Expand Up @@ -1285,6 +1280,16 @@ jobs:
name: librustdesk.so.i686-linux-android
path: ./flutter/android/app/src/main/jniLibs/x86

- name: fix android for flutter 3.13
if: ${{ env.ANDROID_FLUTTER_VERSION == '3.13.9' }}
run: |
cd flutter
sed -i 's/uni_links_desktop/#uni_links_desktop/g' pubspec.yaml
sed -i 's/extended_text: .*/extended_text: 11.1.0/' pubspec.yaml
flutter pub get
cd lib
find . | grep dart | xargs sed -i 's/textScaler: TextScaler.linear(\(.*\)),/textScaleFactor: \1,/g'
- name: Build rustdesk
shell: bash
env:
Expand Down Expand Up @@ -1358,6 +1363,7 @@ jobs:
signed-apk/rustdesk-${{ env.VERSION }}-universal${{ env.suffix }}.apk
build-rustdesk-linux:
if: false
needs: [generate-bridge]
name: build rustdesk linux ${{ matrix.job.target }}
runs-on: ${{ matrix.job.on }}
Expand All @@ -1378,7 +1384,7 @@ jobs:
arch: aarch64,
target: aarch64-unknown-linux-gnu,
distro: ubuntu18.04,
on: ubuntu-22.04-arm,
on: [self-hosted, Linux, ARM64],
deb_arch: arm64,
vcpkg-triplet: arm64-linux,
}
Expand All @@ -1391,20 +1397,16 @@ jobs:
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
- name: Maximize build space
if: ${{ matrix.job.arch == 'x86_64' }}
run: |
sudo rm -rf /opt/ghc
sudo rm -rf /usr/local/lib/android
sudo rm -rf /usr/share/dotnet
sudo apt-get update -y
sudo apt-get install -y nasm
if [[ "${{ matrix.job.arch }}" == "x86_64" ]]; then
sudo apt-get install -y qemu-user-static
fi
sudo apt-get install -y nasm qemu-user-static
- name: Checkout source code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Set Swap Space
if: ${{ matrix.job.arch == 'x86_64' }}
Expand Down Expand Up @@ -1694,7 +1696,9 @@ jobs:
res/rustdesk-${{ env.VERSION }}*.zst
build-rustdesk-linux-sciter:
if: ${{ inputs.upload-artifact }}
if: false
#if: ${{ inputs.upload-artifact }}
needs: build-rustdesk-linux # not for dep, just make it run later for parallelism
runs-on: ${{ matrix.job.on }}
name: build-rustdesk-linux-sciter ${{ matrix.job.target }}
strategy:
Expand All @@ -1715,7 +1719,7 @@ jobs:
- {
arch: armv7,
target: armv7-unknown-linux-gnueabihf,
on: ubuntu-22.04-arm,
on: [self-hosted, Linux, ARM64],
distro: ubuntu18.04-rustdesk,
deb_arch: armhf,
sciter_arch: arm32,
Expand All @@ -1732,8 +1736,6 @@ jobs:
- name: Checkout source code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Free Space
run: |
Expand Down Expand Up @@ -1914,7 +1916,8 @@ jobs:
name: Build appimage ${{ matrix.job.target }}
needs: [build-rustdesk-linux]
runs-on: ubuntu-20.04
if: ${{ inputs.upload-artifact }}
#if: ${{ inputs.upload-artifact }}
if: false
strategy:
fail-fast: false
matrix:
Expand All @@ -1924,8 +1927,6 @@ jobs:
steps:
- name: Checkout source code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Download Binary
uses: actions/download-artifact@master
Expand Down Expand Up @@ -1968,7 +1969,8 @@ jobs:
- build-rustdesk-linux
- build-rustdesk-linux-sciter
runs-on: ${{ matrix.job.on }}
if: ${{ inputs.upload-artifact }}
#if: ${{ inputs.upload-artifact }}
if: false
strategy:
fail-fast: false
matrix:
Expand All @@ -1991,15 +1993,13 @@ jobs:
target: aarch64-unknown-linux-gnu,
# try out newer flatpak since error of "error: Nothing matches org.freedesktop.Platform in remote flathub"
distro: ubuntu22.04,
on: ubuntu-22.04-arm,
on: [self-hosted, Linux, ARM64],
arch: aarch64,
suffix: "",
}
steps:
- name: Checkout source code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Download Binary
uses: actions/download-artifact@master
Expand Down Expand Up @@ -2047,7 +2047,7 @@ jobs:
flatpak/rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}${{ matrix.job.suffix }}.flatpak
build-rustdesk-web:
if: False
if: false
name: build-rustdesk-web
runs-on: ubuntu-20.04
strategy:
Expand All @@ -2057,8 +2057,6 @@ jobs:
steps:
- name: Checkout source code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Prepare env
run: |
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/flutter-nightly.yml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Flutter Nightly Build

on:
schedule:
# schedule build every night
- cron: "0 0 * * *"
workflow_dispatch:

jobs:
Expand Down

0 comments on commit 096df19

Please # to comment.