From 942416d366281b4896bafa9a795f75bf3b20e136 Mon Sep 17 00:00:00 2001 From: Finn Evers Date: Wed, 19 Aug 2026 22:28:55 +0000 Subject: [PATCH] ci: Acquire `ts_query_ls` using the `gh` CLI instead (#62900) Release Notes: - N/A --- .github/workflows/extension_tests.yml | 8 +++----- .github/workflows/run_tests.yml | 8 +++----- tooling/xtask/src/tasks/workflows/run_tests.rs | 16 ++++++---------- 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/.github/workflows/extension_tests.yml b/.github/workflows/extension_tests.yml index 885ef12b3d..048364bd25 100644 --- a/.github/workflows/extension_tests.yml +++ b/.github/workflows/extension_tests.yml @@ -145,11 +145,9 @@ jobs: mkdir -p /tmp/ext-output "$GITHUB_WORKSPACE/zed-extension" --source-dir . --scratch-dir /tmp/ext-scratch --output-dir /tmp/ext-output - name: run_tests::fetch_ts_query_ls - uses: dsaltares/fetch-gh-release-asset@aa37ae5c44d3c9820bc12fe675e8670ecd93bd1c - with: - repo: ribru17/ts_query_ls - version: tags/v3.15.1 - file: ts_query_ls-x86_64-unknown-linux-gnu.tar.gz + run: gh release download v3.15.1 --repo ribru17/ts_query_ls --pattern ts_query_ls-x86_64-unknown-linux-gnu.tar.gz --dir "$GITHUB_WORKSPACE" + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: run_tests::run_ts_query_ls run: |- tar -xf "$GITHUB_WORKSPACE/ts_query_ls-x86_64-unknown-linux-gnu.tar.gz" -C "$GITHUB_WORKSPACE" diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index aa4ca894f0..8e16019743 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -173,11 +173,9 @@ jobs: with: config: ./typos.toml - name: run_tests::fetch_ts_query_ls - uses: dsaltares/fetch-gh-release-asset@aa37ae5c44d3c9820bc12fe675e8670ecd93bd1c - with: - repo: ribru17/ts_query_ls - version: tags/v3.15.1 - file: ts_query_ls-x86_64-unknown-linux-gnu.tar.gz + run: gh release download v3.15.1 --repo ribru17/ts_query_ls --pattern ts_query_ls-x86_64-unknown-linux-gnu.tar.gz --dir "$GITHUB_WORKSPACE" + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: run_tests::run_ts_query_ls run: |- tar -xf "$GITHUB_WORKSPACE/ts_query_ls-x86_64-unknown-linux-gnu.tar.gz" -C "$GITHUB_WORKSPACE" diff --git a/tooling/xtask/src/tasks/workflows/run_tests.rs b/tooling/xtask/src/tasks/workflows/run_tests.rs index cb424ffa23..cfb86a26e0 100644 --- a/tooling/xtask/src/tasks/workflows/run_tests.rs +++ b/tooling/xtask/src/tasks/workflows/run_tests.rs @@ -392,17 +392,13 @@ pub(crate) const DETECT_CHANGED_EXTENSIONS_SCRIPT: &str = indoc::indoc! {r#" "#}; const TS_QUERY_LS_FILE: &str = "ts_query_ls-x86_64-unknown-linux-gnu.tar.gz"; -const CI_TS_QUERY_RELEASE: &str = "tags/v3.15.1"; +const CI_TS_QUERY_RELEASE: &str = "v3.15.1"; -pub(crate) fn fetch_ts_query_ls() -> Step { - named::uses( - "dsaltares", - "fetch-gh-release-asset", - "aa37ae5c44d3c9820bc12fe675e8670ecd93bd1c", - ) // v1.1.1 - .add_with(("repo", "ribru17/ts_query_ls")) - .add_with(("version", CI_TS_QUERY_RELEASE)) - .add_with(("file", TS_QUERY_LS_FILE)) +pub(crate) fn fetch_ts_query_ls() -> Step { + named::bash(formatdoc!( + r#"gh release download {CI_TS_QUERY_RELEASE} --repo ribru17/ts_query_ls --pattern {TS_QUERY_LS_FILE} --dir "$GITHUB_WORKSPACE""# + )) + .add_env(("GH_TOKEN", vars::GITHUB_TOKEN)) } pub(crate) enum RunContext {