From c46b6e1166d316f34c649c91fab2fd07600ea70f Mon Sep 17 00:00:00 2001 From: Myriad-Dreamin <35292584+Myriad-Dreamin@users.noreply.github.com> Date: Mon, 30 Jun 2025 11:27:49 +0800 Subject: [PATCH] fix: upgrade builder for windows binaries (#1794) * fix: change windows builder to windows latest * build: upgrade cargo-dist * chore: update * chore: update * fix: tinymist.3 --- .github/workflows/announce.yml | 2 +- .github/workflows/release.yml | 10 ++++++++-- dist-workspace.toml | 24 +++++++++--------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/announce.yml b/.github/workflows/announce.yml index 784b6c74..bdd7f999 100644 --- a/.github/workflows/announce.yml +++ b/.github/workflows/announce.yml @@ -29,7 +29,7 @@ jobs: # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/Myriad-Dreamin/cargo-dist/releases/download/v0.28.0-tinymist.8/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/Myriad-Dreamin/cargo-dist/releases/download/v0.28.6-tinymist.3/cargo-dist-installer.sh | sh" - name: Install parse changelog uses: taiki-e/install-action@parse-changelog - name: Install Node.js diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6b45b318..3e960d70 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,7 @@ -# This file was autogenerated by dist: https://opensource.axo.dev/cargo-dist/ +# This file was autogenerated by dist: https://github.com/astral-sh/cargo-dist # # Copyright 2022-2024, axodotdev +# Copyright 2025 Astral Software Inc. # SPDX-License-Identifier: MIT or Apache-2.0 # # CI that: @@ -78,12 +79,13 @@ jobs: steps: - uses: actions/checkout@v4 with: + persist-credentials: false submodules: recursive - name: Install dist # we specify bash to get pipefail; it guards against the `curl` command # failing. otherwise `sh` won't catch that `curl` returned non-0 shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/Myriad-Dreamin/cargo-dist/releases/download/v0.28.0-tinymist.8/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/Myriad-Dreamin/cargo-dist/releases/download/v0.28.6-tinymist.3/cargo-dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@v4 with: @@ -137,6 +139,7 @@ jobs: git config --global core.longpaths true - uses: actions/checkout@v4 with: + persist-credentials: false submodules: recursive - name: Install Rust non-interactively if not already installed if: ${{ matrix.container }} @@ -199,6 +202,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + persist-credentials: false submodules: recursive - name: Install cached dist uses: actions/download-artifact@v4 @@ -248,6 +252,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + persist-credentials: false submodules: recursive - name: Install cached dist uses: actions/download-artifact@v4 @@ -310,4 +315,5 @@ jobs: steps: - uses: actions/checkout@v4 with: + persist-credentials: false submodules: recursive diff --git a/dist-workspace.toml b/dist-workspace.toml index b4c4d7aa..697e94cc 100644 --- a/dist-workspace.toml +++ b/dist-workspace.toml @@ -4,9 +4,9 @@ members = ["cargo:."] # Config for 'dist' [dist] # The preferred dist version to use in CI (Cargo.toml SemVer syntax) -cargo-dist-version = "0.28.0-tinymist.8" +cargo-dist-version = "0.28.6-tinymist.3" # A URL to use to install `cargo-dist` (with the installer script) -cargo-dist-url-override = "https://github.com/Myriad-Dreamin/cargo-dist/releases/download/v0.28.0-tinymist.8" +cargo-dist-url-override = "https://github.com/Myriad-Dreamin/cargo-dist/releases/download/v0.28.6-tinymist.3" # CI backends to support ci = "github" # The installers to generate for each app @@ -62,18 +62,12 @@ install-path = ["$XDG_BIN_HOME/", "$XDG_DATA_HOME/../bin", "~/.local/bin"] # Whether to cache builds cache-builds = true +[dist.min-glibc-version] +# Override glibc version for specific target triplets. +aarch64-unknown-linux-gnu = "2.28" +riscv64gc-unknown-linux-gnu = "2.31" +# Override all remaining glibc versions. +"*" = "2.17" + [dist.github-custom-runners] -global = "ubuntu-22.04" aarch64-pc-windows-msvc = "windows-latest" -aarch64-unknown-linux-gnu = "ubuntu-22.04" -aarch64-unknown-linux-musl = "ubuntu-22.04" -arm-unknown-linux-gnueabihf = "ubuntu-22.04" -arm-unknown-linux-musleabihf = "ubuntu-22.04" -armv7-unknown-linux-gnueabihf = "ubuntu-22.04" -armv7-unknown-linux-musleabihf = "ubuntu-22.04" -x86_64-unknown-linux-gnu = "ubuntu-22.04" -x86_64-unknown-linux-musl = "ubuntu-22.04" -# riscv64gc-unknown-linux-gnu = "ubuntu-22.04" -riscv64gc-unknown-linux-musl = "ubuntu-22.04" -loongarch64-unknown-linux-gnu = "ubuntu-22.04" -loongarch64-unknown-linux-musl = "ubuntu-22.04"