From 36815e9a027e9a05765f361ae4f22e47b004ec8a Mon Sep 17 00:00:00 2001 From: fufesou <13586388+fufesou@users.noreply.github.com> Date: Sat, 12 Apr 2025 12:39:05 +0800 Subject: [PATCH] fix: build macos (#11448) Signed-off-by: fufesou --- .github/workflows/ci.yml | 3 +-- .github/workflows/flutter-build.yml | 5 +++++ .github/workflows/playground.yml | 3 +-- vcpkg.json | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 690e3cf44..e5d53419d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,9 +4,8 @@ env: # MIN_SUPPORTED_RUST_VERSION: "1.46.0" # CICD_INTERMEDIATES_DIR: "_cicd-intermediates" VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" - # vcpkg version: 2024.11.16 # for multiarch gcc compatibility - VCPKG_COMMIT_ID: "b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c" + VCPKG_COMMIT_ID: "6f29f12e82a8293156836ad81cc9bf5af41fe836" on: workflow_dispatch: diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml index 9d18f3bb1..59d244e11 100644 --- a/.github/workflows/flutter-build.yml +++ b/.github/workflows/flutter-build.yml @@ -32,6 +32,11 @@ env: TAG_NAME: "${{ inputs.upload-tag }}" VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" # vcpkg version: 2025.01.13 + # If we change the `VCPKG COMMIT_ID`, please remember: + # 1. Call `$VCPKG_ROOT/vcpkg x-update-baseline` to update the baseline in `vcpkg.json`. + # Or we may face build issue like + # https://github.com/rustdesk/rustdesk/actions/runs/14414119794/job/40427970174 + # 2. Update the `VCPKG_COMMIT_ID` in `ci.yml` and `playground.yml`. VCPKG_COMMIT_ID: "6f29f12e82a8293156836ad81cc9bf5af41fe836" VERSION: "1.3.9" NDK_VERSION: "r27c" diff --git a/.github/workflows/playground.yml b/.github/workflows/playground.yml index 97ea99085..1ddb25a72 100644 --- a/.github/workflows/playground.yml +++ b/.github/workflows/playground.yml @@ -16,8 +16,7 @@ env: FLUTTER_ELINUX_VERSION: "3.16.9" TAG_NAME: "nightly" VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" - # vcpkg version: 2024.11.16 - VCPKG_COMMIT_ID: "b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c" + VCPKG_COMMIT_ID: "6f29f12e82a8293156836ad81cc9bf5af41fe836" VERSION: "1.3.9" NDK_VERSION: "r26d" #signing keys env variable checks diff --git a/vcpkg.json b/vcpkg.json index 1ad85d186..394b94614 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -86,7 +86,7 @@ "vcpkg-configuration": { "default-registry": { "kind": "builtin", - "baseline": "f7423ee180c4b7f40d43402c2feb3859161ef625" + "baseline": "6f29f12e82a8293156836ad81cc9bf5af41fe836" }, "overlay-ports": [ "./res/vcpkg"