Skip to content

Commit

Permalink
Merge branch 'main' of github.com:GlareDB/glaredb into universalmind3…
Browse files Browse the repository at this point in the history
…03/benchmark-timings
  • Loading branch information
universalmind303 committed Jan 19, 2024
2 parents 7abf206 + b2a829b commit fff33e7
Show file tree
Hide file tree
Showing 22 changed files with 119 additions and 134 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/benchmarks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
name: Setup just
with:
just-version: "1.23.0"
- uses: actions/cache@v3
- uses: actions/cache@v4
name: Cache
with:
path: |
Expand Down
54 changes: 27 additions & 27 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,26 @@ jobs:
- uses: extractions/setup-just@v1
with:
just-version: "1.23.0"
- uses: actions/cache@v3
- uses: actions/cache@v4
name: toolchain cache
with:
path: |
~/.rustup/toolchains/
key: ${{ runner.os }}-toolchain-${{ hashFiles('**/rust-toolchain.toml') }}
- uses: actions/cache@v3
- uses: actions/cache@v4
name: cargo cache
with:
path: |
~/.cargo/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- uses: actions/cache@v3
- uses: actions/cache@v4
name: build cache
with:
path: |
target/
!target/**/glaredb
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- uses: actions/cache@v3
- uses: actions/cache@v4
name: glaredb cache
with:
path: target/debug/glaredb
Expand All @@ -58,13 +58,13 @@ jobs:
- uses: extractions/setup-just@v1
with:
just-version: "1.23.0"
- uses: actions/cache@v3
- uses: actions/cache@v4
name: toolchain cache
with:
path: |
~/.rustup/toolchains/
key: ${{ runner.os }}-toolchain-${{ hashFiles('**/rust-toolchain.toml') }}
- uses: actions/cache@v3
- uses: actions/cache@v4
name: cargo cache
with:
path: |
Expand All @@ -87,13 +87,13 @@ jobs:
- uses: extractions/setup-just@v1
with:
just-version: "1.23.0"
- uses: actions/cache@v3
- uses: actions/cache@v4
name: toolchain cache
with:
path: |
~/.rustup/toolchains/
key: ${{ runner.os }}-toolchain-${{ hashFiles('**/rust-toolchain.toml') }}
- uses: actions/cache@v3
- uses: actions/cache@v4
name: cargo cache
with:
path: |
Expand All @@ -113,19 +113,19 @@ jobs:
- uses: extractions/setup-just@v1
with:
just-version: "1.23.0"
- uses: actions/cache@v3
- uses: actions/cache@v4
name: toolchain cache
with:
path: |
~/.rustup/toolchains/
key: ${{ runner.os }}-toolchain-${{ hashFiles('**/rust-toolchain.toml') }}
- uses: actions/cache@v3
- uses: actions/cache@v4
name: cargo cache
with:
path: |
~/.cargo/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- uses: actions/cache@v3
- uses: actions/cache@v4
name: build cache
with:
path: |
Expand All @@ -152,19 +152,19 @@ jobs:
- uses: extractions/setup-just@v1
with:
just-version: "1.23.0"
- uses: actions/cache@v3
- uses: actions/cache@v4
name: toolchain cache
with:
path: |
~/.rustup/toolchains/
key: ${{ runner.os }}-toolchain-${{ hashFiles('**/rust-toolchain.toml') }}
- uses: actions/cache@v3
- uses: actions/cache@v4
name: cargo cache
with:
path: |
~/.cargo/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- uses: actions/cache@v3
- uses: actions/cache@v4
name: build cache
with:
path: |
Expand All @@ -186,19 +186,19 @@ jobs:
- uses: extractions/setup-just@v1
with:
just-version: "1.23.0"
- uses: actions/cache@v3
- uses: actions/cache@v4
name: toolchain cache
with:
path: |
~/.rustup/toolchains/
key: ${{ runner.os }}-toolchain-${{ hashFiles('**/rust-toolchain.toml') }}
- uses: actions/cache@v3
- uses: actions/cache@v4
name: cargo cache
with:
path: |
~/.cargo/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- uses: actions/cache@v3
- uses: actions/cache@v4
name: build cache
with:
path: |
Expand All @@ -225,7 +225,7 @@ jobs:
- uses: extractions/setup-just@v1
with:
just-version: "1.23.0"
- uses: actions/cache@v3
- uses: actions/cache@v4
name: glaredb cache
with:
path: target/debug/glaredb
Expand Down Expand Up @@ -265,31 +265,31 @@ jobs:
python-version: "3.11"
cache: poetry
cache-dependency-path: tests/poetry.lock
- uses: actions/cache@v3
- uses: actions/cache@v4
name: toolchain cache
with:
path: |
~/.rustup/toolchains/
key: ${{ runner.os }}-toolchain-${{ hashFiles('**/rust-toolchain.toml') }}
- uses: actions/cache@v3
- uses: actions/cache@v4
name: cargo cache
with:
path: |
~/.cargo/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- uses: actions/cache@v3
- uses: actions/cache@v4
name: build cache
with:
path: |
target/
!target/**/glaredb
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- uses: actions/cache@v3
- uses: actions/cache@v4
name: glaredb cache
with:
path: target/debug/glaredb
key: ${{ github.run_id }}
- uses: actions/cache@v3
- uses: actions/cache@v4
name: py cache
with:
path: |
Expand All @@ -311,7 +311,7 @@ jobs:
- uses: extractions/setup-just@v1
with:
just-version: "1.23.0"
- uses: actions/cache@v3
- uses: actions/cache@v4
name: glaredb cache
with:
path: target/debug/glaredb
Expand Down Expand Up @@ -423,7 +423,7 @@ jobs:
- uses: extractions/setup-just@v1
with:
just-version: "1.23.0"
- uses: actions/cache@v3
- uses: actions/cache@v4
name: glaredb cache
with:
path: target/debug/glaredb
Expand Down Expand Up @@ -515,7 +515,7 @@ jobs:
- uses: extractions/setup-just@v1
with:
just-version: "1.23.0"
- uses: actions/cache@v3
- uses: actions/cache@v4
name: glaredb cache
with:
path: target/debug/glaredb
Expand Down Expand Up @@ -548,7 +548,7 @@ jobs:
- uses: extractions/setup-just@v1
with:
just-version: "1.23.0"
- uses: actions/cache@v3
- uses: actions/cache@v4
name: glaredb cache
with:
path: target/debug/glaredb
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nodejs-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
targets: ${{ matrix.settings.target }}

- name: Cache cargo
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cargo/registry/index/
Expand Down
Loading

0 comments on commit fff33e7

Please sign in to comment.