From 24660628a5c9ca3571978a249230106b7faf8305 Mon Sep 17 00:00:00 2001 From: botanicvelious Date: Sun, 22 Jan 2023 20:31:27 -0700 Subject: [PATCH 01/13] enable i686 --- .github/workflows/flutter-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flutter-nightly.yml b/.github/workflows/flutter-nightly.yml index b33a6dba0..8344e562c 100644 --- a/.github/workflows/flutter-nightly.yml +++ b/.github/workflows/flutter-nightly.yml @@ -30,7 +30,7 @@ jobs: fail-fast: false matrix: job: - # - { target: i686-pc-windows-msvc , os: windows-2019 } + - { target: i686-pc-windows-msvc , os: windows-2019 } # - { target: x86_64-pc-windows-gnu , os: windows-2019 } - { target: x86_64-pc-windows-msvc, os: windows-2019 } steps: From 5aa4c420a4368c96fdb65eaee191a258ba8845aa Mon Sep 17 00:00:00 2001 From: botanicvelious Date: Sun, 22 Jan 2023 20:38:18 -0700 Subject: [PATCH 02/13] update flutter version to 3.3.10 --- .github/workflows/flutter-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flutter-nightly.yml b/.github/workflows/flutter-nightly.yml index 8344e562c..600dd47a2 100644 --- a/.github/workflows/flutter-nightly.yml +++ b/.github/workflows/flutter-nightly.yml @@ -9,7 +9,7 @@ on: env: LLVM_VERSION: "10.0" # Note: currently 3.0.5 does not support arm64 officially, we use latest stable version first. - FLUTTER_VERSION: "3.0.5" + FLUTTER_VERSION: "3.3.10" TAG_NAME: "nightly" # vcpkg version: 2022.05.10 # for multiarch gcc compatibility From 9793b35ad6c5c01d967bb8b9f36d00bdbb623e66 Mon Sep 17 00:00:00 2001 From: botanicvelious Date: Sun, 22 Jan 2023 20:40:55 -0700 Subject: [PATCH 03/13] Update flutter-ci.yml --- .github/workflows/flutter-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flutter-ci.yml b/.github/workflows/flutter-ci.yml index 4e98f311d..9dc2bac7d 100644 --- a/.github/workflows/flutter-ci.yml +++ b/.github/workflows/flutter-ci.yml @@ -14,7 +14,7 @@ on: env: LLVM_VERSION: "10.0" # Note: currently 3.0.5 does not support arm64 officially, we use latest stable version first. - FLUTTER_VERSION: "3.0.5" + FLUTTER_VERSION: "3.3.10" # vcpkg version: 2022.05.10 # for multiarch gcc compatibility VCPKG_COMMIT_ID: "14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44" From 0838a77908c07e6443a80465077eb7f0403cc0a0 Mon Sep 17 00:00:00 2001 From: botanicvelious Date: Sun, 22 Jan 2023 20:41:48 -0700 Subject: [PATCH 04/13] update llvm version --- .github/workflows/flutter-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flutter-ci.yml b/.github/workflows/flutter-ci.yml index 9dc2bac7d..67c485fa7 100644 --- a/.github/workflows/flutter-ci.yml +++ b/.github/workflows/flutter-ci.yml @@ -12,7 +12,7 @@ on: - ".github/**" env: - LLVM_VERSION: "10.0" + LLVM_VERSION: "15.0.6" # Note: currently 3.0.5 does not support arm64 officially, we use latest stable version first. FLUTTER_VERSION: "3.3.10" # vcpkg version: 2022.05.10 From fb641900755f15e61952a487d0d47f996fc150a1 Mon Sep 17 00:00:00 2001 From: botanicvelious Date: Sun, 22 Jan 2023 20:42:09 -0700 Subject: [PATCH 05/13] update llvm version --- .github/workflows/flutter-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flutter-nightly.yml b/.github/workflows/flutter-nightly.yml index 600dd47a2..cc6aa2eb8 100644 --- a/.github/workflows/flutter-nightly.yml +++ b/.github/workflows/flutter-nightly.yml @@ -7,7 +7,7 @@ on: workflow_dispatch: env: - LLVM_VERSION: "10.0" + LLVM_VERSION: "15.0.6" # Note: currently 3.0.5 does not support arm64 officially, we use latest stable version first. FLUTTER_VERSION: "3.3.10" TAG_NAME: "nightly" From 3e0ae64d61fdb4b6bb1f1ea5b5d7b713e1487f0c Mon Sep 17 00:00:00 2001 From: botanicvelious Date: Sun, 22 Jan 2023 20:48:11 -0700 Subject: [PATCH 06/13] remove custom flutter from windows --- .github/workflows/flutter-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/flutter-ci.yml b/.github/workflows/flutter-ci.yml index 67c485fa7..e7ddba331 100644 --- a/.github/workflows/flutter-ci.yml +++ b/.github/workflows/flutter-ci.yml @@ -47,13 +47,13 @@ jobs: flutter-version: ${{ env.FLUTTER_VERSION }} cache: true - - name: Replace engine with rustdesk custom flutter engine - run: | - flutter doctor -v - flutter precache --windows - Invoke-WebRequest -Uri https://github.com/Kingtous/engine/releases/download/v3.0.5-rustdesk.2/windows-x64-flutter-release.zip -OutFile windows-x64-flutter-release.zip - Expand-Archive windows-x64-flutter-release.zip -DestinationPath engine - mv -Force engine/* C:/hostedtoolcache/windows/flutter/stable-3.0.5-x64/bin/cache/artifacts/engine/windows-x64-release/ + #- name: Replace engine with rustdesk custom flutter engine + # run: | + # flutter doctor -v + # flutter precache --windows + # Invoke-WebRequest -Uri https://github.com/Kingtous/engine/releases/download/v3.0.5-rustdesk.2/windows-x64-flutter-release.zip -OutFile windows-x64-flutter-release.zip + # Expand-Archive windows-x64-flutter-release.zip -DestinationPath engine + # mv -Force engine/* C:/hostedtoolcache/windows/flutter/stable-3.0.5-x64/bin/cache/artifacts/engine/windows-x64-release/ - name: Install Rust toolchain uses: actions-rs/toolchain@v1 From 5ee350d58d9d6fd7a3386d0dd706ca0e641ddda8 Mon Sep 17 00:00:00 2001 From: botanicvelious Date: Sun, 22 Jan 2023 20:53:39 -0700 Subject: [PATCH 07/13] Update flutter-nightly.yml --- .github/workflows/flutter-nightly.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/flutter-nightly.yml b/.github/workflows/flutter-nightly.yml index cc6aa2eb8..362161fae 100644 --- a/.github/workflows/flutter-nightly.yml +++ b/.github/workflows/flutter-nightly.yml @@ -49,13 +49,13 @@ jobs: flutter-version: ${{ env.FLUTTER_VERSION }} cache: true - - name: Replace engine with rustdesk custom flutter engine - run: | - flutter doctor -v - flutter precache --windows - Invoke-WebRequest -Uri https://github.com/Kingtous/engine/releases/download/v3.0.5-rustdesk.2/windows-x64-flutter-release.zip -OutFile windows-x64-flutter-release.zip - Expand-Archive windows-x64-flutter-release.zip -DestinationPath engine - mv -Force engine/* C:/hostedtoolcache/windows/flutter/stable-3.0.5-x64/bin/cache/artifacts/engine/windows-x64-release/ + #- name: Replace engine with rustdesk custom flutter engine + # run: | + # flutter doctor -v + # flutter precache --windows + # Invoke-WebRequest -Uri https://github.com/Kingtous/engine/releases/download/v3.0.5-rustdesk.2/windows-x64-flutter-release.zip -OutFile windows-x64-flutter-release.zip + # Expand-Archive windows-x64-flutter-release.zip -DestinationPath engine + # mv -Force engine/* C:/hostedtoolcache/windows/flutter/stable-3.0.5-x64/bin/cache/artifacts/engine/windows-x64-release/ - name: Install Rust toolchain uses: actions-rs/toolchain@v1 From 7f13f28d2921e4cc7a6499ba2ae127b82000663a Mon Sep 17 00:00:00 2001 From: botanicvelious Date: Sun, 22 Jan 2023 21:13:25 -0700 Subject: [PATCH 08/13] dont need to install rust toolchain twice --- .github/workflows/flutter-ci.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/flutter-ci.yml b/.github/workflows/flutter-ci.yml index e7ddba331..feaefc115 100644 --- a/.github/workflows/flutter-ci.yml +++ b/.github/workflows/flutter-ci.yml @@ -503,14 +503,6 @@ jobs: key: ${{ matrix.job.target }}-${{ matrix.job.extra-build-features }} cache-directories: "/opt/rust-registry" - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: ${{ matrix.job.target }} - override: true - profile: minimal # minimal component installation (ie, no documentation) - - name: Install local registry run: | mkdir -p /opt/rust-registry @@ -669,14 +661,6 @@ jobs: override: true profile: minimal # minimal component installation (ie, no documentation) - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: ${{ matrix.job.target }} - override: true - profile: minimal # minimal component installation (ie, no documentation) - - uses: Swatinem/rust-cache@v2 with: prefix-key: rustdesk-lib-cache From 35a7e4f8b730b553fbad6fc80cc9aec2450e92fc Mon Sep 17 00:00:00 2001 From: botanicvelious Date: Sun, 22 Jan 2023 21:16:46 -0700 Subject: [PATCH 09/13] dont need rust toolchain twice --- .github/workflows/flutter-nightly.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/flutter-nightly.yml b/.github/workflows/flutter-nightly.yml index 362161fae..b26b6bc38 100644 --- a/.github/workflows/flutter-nightly.yml +++ b/.github/workflows/flutter-nightly.yml @@ -649,14 +649,6 @@ jobs: key: ${{ matrix.job.target }}-${{ matrix.job.extra-build-features }} cache-directories: "/opt/rust-registry" - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: ${{ matrix.job.target }} - override: true - profile: minimal # minimal component installation (ie, no documentation) - - name: Install local registry run: | mkdir -p /opt/rust-registry @@ -815,14 +807,6 @@ jobs: override: true profile: minimal # minimal component installation (ie, no documentation) - - name: Install Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - target: ${{ matrix.job.target }} - override: true - profile: minimal # minimal component installation (ie, no documentation) - - uses: Swatinem/rust-cache@v2 with: prefix-key: rustdesk-lib-cache From 5f0aff55009c601bdf7d352c969f04af58732a2a Mon Sep 17 00:00:00 2001 From: botanicvelious Date: Sun, 22 Jan 2023 21:21:37 -0700 Subject: [PATCH 10/13] enable i686 --- .github/workflows/flutter-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flutter-ci.yml b/.github/workflows/flutter-ci.yml index feaefc115..efcd02170 100644 --- a/.github/workflows/flutter-ci.yml +++ b/.github/workflows/flutter-ci.yml @@ -28,7 +28,7 @@ jobs: fail-fast: true matrix: job: - # - { target: i686-pc-windows-msvc , os: windows-2019 } + - { target: i686-pc-windows-msvc , os: windows-2019 } # - { target: x86_64-pc-windows-gnu , os: windows-2019 } - { target: x86_64-pc-windows-msvc, os: windows-2019 } steps: From f1236f42e1824d74f1ea8a734dfad0e34016cbc1 Mon Sep 17 00:00:00 2001 From: botanicvelious Date: Sun, 22 Jan 2023 21:29:00 -0700 Subject: [PATCH 11/13] go back to 3.0.5 --- .github/workflows/flutter-nightly.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/flutter-nightly.yml b/.github/workflows/flutter-nightly.yml index b26b6bc38..6000552c7 100644 --- a/.github/workflows/flutter-nightly.yml +++ b/.github/workflows/flutter-nightly.yml @@ -9,7 +9,7 @@ on: env: LLVM_VERSION: "15.0.6" # Note: currently 3.0.5 does not support arm64 officially, we use latest stable version first. - FLUTTER_VERSION: "3.3.10" + FLUTTER_VERSION: "3.0.5" TAG_NAME: "nightly" # vcpkg version: 2022.05.10 # for multiarch gcc compatibility @@ -49,13 +49,13 @@ jobs: flutter-version: ${{ env.FLUTTER_VERSION }} cache: true - #- name: Replace engine with rustdesk custom flutter engine - # run: | - # flutter doctor -v - # flutter precache --windows - # Invoke-WebRequest -Uri https://github.com/Kingtous/engine/releases/download/v3.0.5-rustdesk.2/windows-x64-flutter-release.zip -OutFile windows-x64-flutter-release.zip - # Expand-Archive windows-x64-flutter-release.zip -DestinationPath engine - # mv -Force engine/* C:/hostedtoolcache/windows/flutter/stable-3.0.5-x64/bin/cache/artifacts/engine/windows-x64-release/ + - name: Replace engine with rustdesk custom flutter engine + run: | + flutter doctor -v + flutter precache --windows + Invoke-WebRequest -Uri https://github.com/Kingtous/engine/releases/download/v3.0.5-rustdesk.2/windows-x64-flutter-release.zip -OutFile windows-x64-flutter-release.zip + Expand-Archive windows-x64-flutter-release.zip -DestinationPath engine + mv -Force engine/* C:/hostedtoolcache/windows/flutter/stable-3.0.5-x64/bin/cache/artifacts/engine/windows-x64-release/ - name: Install Rust toolchain uses: actions-rs/toolchain@v1 From a8dd49d85f1fc0c31856b2c4d705feab27c373c8 Mon Sep 17 00:00:00 2001 From: botanicvelious Date: Sun, 22 Jan 2023 22:04:39 -0700 Subject: [PATCH 12/13] revert 3.0.5 --- .github/workflows/flutter-ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/flutter-ci.yml b/.github/workflows/flutter-ci.yml index efcd02170..34730984f 100644 --- a/.github/workflows/flutter-ci.yml +++ b/.github/workflows/flutter-ci.yml @@ -14,7 +14,7 @@ on: env: LLVM_VERSION: "15.0.6" # Note: currently 3.0.5 does not support arm64 officially, we use latest stable version first. - FLUTTER_VERSION: "3.3.10" + FLUTTER_VERSION: "3.0.5" # vcpkg version: 2022.05.10 # for multiarch gcc compatibility VCPKG_COMMIT_ID: "14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44" @@ -47,13 +47,13 @@ jobs: flutter-version: ${{ env.FLUTTER_VERSION }} cache: true - #- name: Replace engine with rustdesk custom flutter engine - # run: | - # flutter doctor -v - # flutter precache --windows - # Invoke-WebRequest -Uri https://github.com/Kingtous/engine/releases/download/v3.0.5-rustdesk.2/windows-x64-flutter-release.zip -OutFile windows-x64-flutter-release.zip - # Expand-Archive windows-x64-flutter-release.zip -DestinationPath engine - # mv -Force engine/* C:/hostedtoolcache/windows/flutter/stable-3.0.5-x64/bin/cache/artifacts/engine/windows-x64-release/ + - name: Replace engine with rustdesk custom flutter engine + run: | + flutter doctor -v + flutter precache --windows + Invoke-WebRequest -Uri https://github.com/Kingtous/engine/releases/download/v3.0.5-rustdesk.2/windows-x64-flutter-release.zip -OutFile windows-x64-flutter-release.zip + Expand-Archive windows-x64-flutter-release.zip -DestinationPath engine + mv -Force engine/* C:/hostedtoolcache/windows/flutter/stable-3.0.5-x64/bin/cache/artifacts/engine/windows-x64-release/ - name: Install Rust toolchain uses: actions-rs/toolchain@v1 From 1d00e321288d05f672ec480323960c5fc5480f12 Mon Sep 17 00:00:00 2001 From: botanicvelious Date: Tue, 24 Jan 2023 03:04:45 -0700 Subject: [PATCH 13/13] i686 doesnt work --- .github/workflows/flutter-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flutter-nightly.yml b/.github/workflows/flutter-nightly.yml index 6000552c7..1f4fcf2ef 100644 --- a/.github/workflows/flutter-nightly.yml +++ b/.github/workflows/flutter-nightly.yml @@ -30,7 +30,7 @@ jobs: fail-fast: false matrix: job: - - { target: i686-pc-windows-msvc , os: windows-2019 } + # - { target: i686-pc-windows-msvc , os: windows-2019 } # - { target: x86_64-pc-windows-gnu , os: windows-2019 } - { target: x86_64-pc-windows-msvc, os: windows-2019 } steps: