From 257fd48591aa1708bb128addc805f8ce2faab2e8 Mon Sep 17 00:00:00 2001 From: san7890 Date: Wed, 6 Dec 2023 18:19:19 -0700 Subject: [PATCH 1/5] hashbanging implementation --- .github/workflows/ci_suite.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index 35ce8d48bdc0d..c3f6456e848b1 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -27,7 +27,7 @@ jobs: uses: actions/cache@v3 with: path: ~/SpacemanDMM - key: ${{ runner.os }}-spacemandmm + key: ${{ runner.os }}-spacemandmm-${{ hashFiles('dependencies.sh') }} - name: Restore Yarn cache uses: actions/cache@v3 with: @@ -53,7 +53,7 @@ jobs: uses: actions/cache@v3 with: path: ~/.cargo - key: ${{ runner.os }}-rust + key: ${{ runner.os }}-rust-${{ hashFiles('~/.cargo')}} - name: Install Tools run: | pip3 install setuptools From 5d5ddd79ad23c87f5a5eaa56d83b199ec13c10d6 Mon Sep 17 00:00:00 2001 From: san7890 Date: Wed, 6 Dec 2023 19:32:58 -0700 Subject: [PATCH 2/5] damn we really have to do it like this huh --- .github/workflows/ci_suite.yml | 8 ++++++-- tools/ci/install_ripgrep.sh | 7 +++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 tools/ci/install_ripgrep.sh diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index c3f6456e848b1..eea5523a3a1ab 100644 --- 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 new file mode 100644 index 0000000000000..bef25e97f70d0 --- /dev/null +++ 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 From 1e5dbb6bd4b24de4f6c0dcf30cae496626f66ef5 Mon Sep 17 00:00:00 2001 From: san7890 Date: Wed, 6 Dec 2023 19:40:03 -0700 Subject: [PATCH 3/5] 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 From a06a4c6d5e3b5a20e2ebf35d62f8db27f8253efb Mon Sep 17 00:00:00 2001 From: san7890 Date: Wed, 6 Dec 2023 19:41:05 -0700 Subject: [PATCH 4/5] whoops --- tools/ci/install_ripgrep.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci/install_ripgrep.sh b/tools/ci/install_ripgrep.sh index f328a12a116eb..455027d93a6eb 100644 --- a/tools/ci/install_ripgrep.sh +++ b/tools/ci/install_ripgrep.sh @@ -1,6 +1,6 @@ #!/bin/bash set -euo pipefail -source tools/ci/dependencies.sh +source tools/ci/ci_dependencies.sh cargo install ripgrep --features pcre2 --version $RIPGREP_VERSION From 3775d64d2bbf267dc72de46503d5f4a191e25358 Mon Sep 17 00:00:00 2001 From: san7890 Date: Wed, 6 Dec 2023 21:21:46 -0700 Subject: [PATCH 5/5] merge conflict artifact --- .github/workflows/ci_suite.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index d84648e392905..2c2eaf7a4f66a 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -58,7 +58,6 @@ jobs: key: ${{ runner.os }}-rust-${{ hashFiles('tools/ci/ci_dependencies.sh')}} restore-keys: | ${{ runner.os }}-rust- - key: ${{ runner.os }}-rust - name: Restore Cutter cache uses: actions/cache@v3 with: