damn we really have to do it like this huh

san7890 · Dec 7, 2023 · 5d5ddd7 · 5d5ddd7
1 parent 257fd48
commit 5d5ddd7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml
@@ -28,6 +28,8 @@ jobs:
         with:
           path: ~/SpacemanDMM
           key: ${{ runner.os }}-spacemandmm-${{ hashFiles('dependencies.sh') }}
+          restore-keys: |
+            ${{ runner.os }}-spacemandmm-
       - name: Restore Yarn cache
         uses: actions/cache@v3
         with:
@@ -53,13 +55,15 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.cargo
-          key: ${{ runner.os }}-rust-${{ hashFiles('~/.cargo')}}
+          key: ${{ runner.os }}-rust-${{ hashFiles('tools/ci/install_ripgrep.sh')}}
+          restore-keys: |
+            ${{ runner.os }}-rust-
       - name: Install Tools
         run: |
           pip3 install setuptools
           bash tools/ci/install_node.sh
           bash tools/ci/install_spaceman_dmm.sh dreamchecker
-          cargo install ripgrep --features pcre2
+          bash tools/ci/install_ripgrep.sh
           tools/bootstrap/python -c ''
       - name: Give Linters A Go
         id: linter-setup

diff --git a/tools/ci/install_ripgrep.sh b/tools/ci/install_ripgrep.sh
@@ -0,0 +1,7 @@
+#!/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
+
+cargo install ripgrep --features pcre2 --version $RIPGREP_VERSION