From 1e5dbb6bd4b24de4f6c0dcf30cae496626f66ef5 Mon Sep 17 00:00:00 2001 From: san7890 Date: Wed, 6 Dec 2023 19:40:03 -0700 Subject: [PATCH] spins it out into another file --- .github/workflows/ci_suite.yml | 2 +- tools/ci/ci_dependencies.sh | 6 ++++++ tools/ci/install_ripgrep.sh | 3 +-- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 tools/ci/ci_dependencies.sh diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index eea5523a3a1ab..203abc5181d7f 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -55,7 +55,7 @@ jobs: uses: actions/cache@v3 with: path: ~/.cargo - key: ${{ runner.os }}-rust-${{ hashFiles('tools/ci/install_ripgrep.sh')}} + key: ${{ runner.os }}-rust-${{ hashFiles('tools/ci/ci_dependencies.sh')}} restore-keys: | ${{ runner.os }}-rust- - name: Install Tools diff --git a/tools/ci/ci_dependencies.sh b/tools/ci/ci_dependencies.sh new file mode 100644 index 0000000000000..fd1bee5ea88a9 --- /dev/null +++ b/tools/ci/ci_dependencies.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +#Project dependencies file +#Contains versions of programs that we might need to install for CI purposes - do not add anything here that is REQUIRED to run the project, this is just for CI. + +export RIPGREP_VERSION=14.0.3 diff --git a/tools/ci/install_ripgrep.sh b/tools/ci/install_ripgrep.sh index bef25e97f70d0..f328a12a116eb 100644 --- a/tools/ci/install_ripgrep.sh +++ b/tools/ci/install_ripgrep.sh @@ -1,7 +1,6 @@ #!/bin/bash set -euo pipefail -# we do not need to source dependencies.sh because rust is not required to run or compile the project - this is for CI only as of right now -RIPGREP_VERSION=14.0.3 +source tools/ci/dependencies.sh cargo install ripgrep --features pcre2 --version $RIPGREP_VERSION