From f0f3a2027cb9c96398f7641dd0b20dc6fb1559d2 Mon Sep 17 00:00:00 2001 From: Kingtous Date: Fri, 21 Oct 2022 08:51:20 +0800 Subject: [PATCH] opt: ci opt: use force to prevent reuse newer bundle tools --- .github/workflows/flutter-nightly.yml | 51 +++++++++++++++++++-------- build.py | 2 +- flutter/pubspec.yaml | 2 +- 3 files changed, 39 insertions(+), 16 deletions(-) diff --git a/.github/workflows/flutter-nightly.yml b/.github/workflows/flutter-nightly.yml index f9a7e4fb2..5374ec72d 100644 --- a/.github/workflows/flutter-nightly.yml +++ b/.github/workflows/flutter-nightly.yml @@ -6,6 +6,12 @@ on: - cron: "0 0 * * *" workflow_dispatch: +env: + LLVM_VERSION: "10.0" + FLUTTER_VERSION: "3.0.5" + TAG_NAME: "nightly" + VCPKG_COMMIT_ID: '6ca56aeb457f033d344a7106cb3f9f1abf8f4e98' + jobs: build-for-windows: name: ${{ matrix.job.target }} (${{ matrix.job.os }}) @@ -22,16 +28,15 @@ jobs: uses: actions/checkout@v3 - name: Install LLVM and Clang - if: startsWith(matrix.job.os, 'windows') uses: KyleMayes/install-llvm-action@v1 with: - version: "13.0" + version: ${{ env.LLVM_VERSION }} - name: Install flutter uses: subosito/flutter-action@v2 with: channel: 'stable' - flutter-version: '3.0.5' + flutter-version: ${{ env.FLUTTER_VERSION }} - name: Install Rust toolchain uses: actions-rs/toolchain@v1 @@ -41,7 +46,9 @@ jobs: override: true profile: minimal # minimal component installation (ie, no documentation) - - uses: Swatinem/rust-cache@v1 + - uses: Swatinem/rust-cache@v2 + with: + prefix-key: ${{ matrix.job.os }} - name: Install flutter rust bridge deps run: | @@ -58,7 +65,7 @@ jobs: uses: lukka/run-vcpkg@v7 with: setupOnly: true - vcpkgGitCommitId: '6ca56aeb457f033d344a7106cb3f9f1abf8f4e98' + vcpkgGitCommitId: ${{ env.VCPKG_COMMIT_ID }} - name: Install vcpkg dependencies run: | @@ -66,13 +73,20 @@ jobs: shell: bash - name: Build rustdesk - run: python3 .\build.py --portable --hwcodec + run: python3 .\build.py --portable --hwcodec --flutter + + - name: Rename rustdesk + shell: bash + run: | + for name in rustdesk*??.exe; do + mv "$name" "${name%%.exe}-${{ matrix.job.target }}.exe" + done - name: Publish Release uses: softprops/action-gh-release@v1 with: prerelease: true - tag_name: "nightly" + tag_name: ${{ env.TAG_NAME }} files: | rustdesk-*.exe @@ -98,7 +112,7 @@ jobs: - name: Install prerequisites run: | case ${{ matrix.job.target }} in - x86_64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt install -y g++ gcc git curl wget nasm yasm libgtk-3-dev clang libxcb-randr0-dev libxdo-dev libxfixes-dev libxcb-shape0-dev libxcb-xfixes0-dev libasound2-dev libpulse-dev cmake libclang-dev ninja-build libayatana-appindicator3-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libvdpau-dev libva-dev;; + x86_64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt install -y g++ gcc git curl wget nasm yasm libgtk-3-dev clang libxcb-randr0-dev libxdo-dev libxfixes-dev libxcb-shape0-dev libxcb-xfixes0-dev libasound2-dev libpulse-dev cmake libclang-dev ninja-build libayatana-appindicator3-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libvdpau-dev libva-dev libclang-dev llvm-dev libclang-10-dev llvm-10-dev;; # arm-unknown-linux-*) sudo apt-get -y update ; sudo apt-get -y install gcc-arm-linux-gnueabihf ;; # aarch64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt-get -y install gcc-aarch64-linux-gnu ;; esac @@ -107,7 +121,7 @@ jobs: uses: subosito/flutter-action@v2 with: channel: 'stable' - flutter-version: '3.0.5' + flutter-version: ${{ env.FLUTTER_VERSION }} - name: Install Rust toolchain uses: actions-rs/toolchain@v1 @@ -117,7 +131,9 @@ jobs: override: true profile: minimal # minimal component installation (ie, no documentation) - - uses: Swatinem/rust-cache@v1 + - uses: Swatinem/rust-cache@v2 + with: + prefix-key: ${{ matrix.job.os }} - name: Install flutter rust bridge deps shell: bash @@ -133,7 +149,7 @@ jobs: uses: lukka/run-vcpkg@v7 with: setupOnly: true - vcpkgGitCommitId: '6ca56aeb457f033d344a7106cb3f9f1abf8f4e98' + vcpkgGitCommitId: ${{ env.VCPKG_COMMIT_ID }} - name: Install vcpkg dependencies run: | @@ -142,7 +158,7 @@ jobs: - name: Install cargo bundle tools run: | - cargo install cargo-bundle + cargo install cargo-bundle --force - name: Show version information (Rust, cargo, GCC) shell: bash @@ -157,11 +173,18 @@ jobs: - name: Build rustdesk run: ./build.py --flutter --hwcodec + - name: Rename rustdesk + shell: bash + run: | + for name in rustdesk*??.deb; do + mv "$name" "${name%%.deb}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb" + done + - name: Publish Release uses: softprops/action-gh-release@v1 with: prerelease: true - tag_name: "nightly" + tag_name: ${{ env.TAG_NAME }} files: | - rustdesk-*.deb + rustdesk*.deb diff --git a/build.py b/build.py index e7deb52ba..403154d85 100755 --- a/build.py +++ b/build.py @@ -204,7 +204,7 @@ def build_flutter_windows(version): else: os.rename("./target/release/rustdesk-portable-packer.exe", "./rustdesk_portable.exe") print(f"output location: {os.path.abspath(os.curdir)}/rustdesk_portable.exe") - os.system(f"cp -rf ./rustdesk_portable.exe ./rustdesk-{version}-install.exe") + os.rename("./rustdesk_portable.exe", f"./rustdesk-{version}-install.exe") print(f"output location: {os.path.abspath(os.curdir)}/rustdesk-{version}-install.exe") def main(): diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml index 6d2cb31b7..f77fe9894 100644 --- a/flutter/pubspec.yaml +++ b/flutter/pubspec.yaml @@ -97,7 +97,7 @@ dependencies: # ref: 62f09545149f320616467c306c8c5f71714a18e6 uni_links: ^0.5.1 uni_links_desktop: ^0.1.3 - path: ^1.8.2 + path: ^1.8.1 dev_dependencies: icons_launcher: ^2.0.4