neon_arch commited on
Commit
15d52b5
·
unverified ·
2 Parent(s): 3f73e85 65f5a4a

Merge branch 'rolling' into feat-disallow-user-to-search-via-lists

Browse files
.github/workflows/rust.yml CHANGED
@@ -4,10 +4,10 @@ name: Rust
4
  on:
5
  push:
6
  branches:
7
- - "**"
8
  pull_request:
9
  branches:
10
- - "rolling"
11
 
12
  env:
13
  CARGO_TERM_COLOR: always
@@ -21,23 +21,27 @@ jobs:
21
  - stable
22
 
23
  steps:
24
- - uses: actions/checkout@v3
25
- - run: rustup toolchain install stable --profile minimal
26
- - uses: Swatinem/rust-cache@v2
27
- with:
28
- prefix-key: ""
29
- shared-key: ""
30
- key: ""
31
- env-vars: ""
32
- workspaces: ""
33
- cache-directories: ""
34
- cache-targets: ""
35
- cache-on-failure: ""
36
- cache-all-crates: ""
37
- save-if: ""
38
- - uses: actions/checkout@v3
39
- - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
40
- - name: Build
41
- run: cargo build --verbose
42
- - name: Run tests
43
- run: cargo test --verbose
 
 
 
 
 
4
  on:
5
  push:
6
  branches:
7
+ - '**'
8
  pull_request:
9
  branches:
10
+ - 'rolling'
11
 
12
  env:
13
  CARGO_TERM_COLOR: always
 
21
  - stable
22
 
23
  steps:
24
+ - name: Install LuaJIT and Lua
25
+ run: |
26
+ sudo apt-get update
27
+ sudo apt-get install -y --no-install-recommends liblua5.4-dev liblua5.3-dev liblua5.2-dev liblua5.1-0-dev libluajit-5.1-dev
28
+ - uses: actions/checkout@v3
29
+ - run: rustup toolchain install stable --profile minimal
30
+ - uses: Swatinem/rust-cache@v2
31
+ with:
32
+ prefix-key: ''
33
+ shared-key: ''
34
+ key: ''
35
+ env-vars: ''
36
+ workspaces: ''
37
+ cache-directories: ''
38
+ cache-targets: ''
39
+ cache-on-failure: ''
40
+ cache-all-crates: ''
41
+ save-if: ''
42
+ - uses: actions/checkout@v3
43
+ - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
44
+ - name: Build
45
+ run: cargo build --verbose
46
+ - name: Run tests
47
+ run: cargo test --verbose
.github/workflows/rust_format.yml CHANGED
@@ -13,6 +13,10 @@ jobs:
13
  name: Rust project
14
  runs-on: ubuntu-latest
15
  steps:
 
 
 
 
16
  - uses: actions/checkout@v2
17
  - name: Install minimal stable with clippy and rustfmt
18
  uses: actions-rs/toolchain@v1
 
13
  name: Rust project
14
  runs-on: ubuntu-latest
15
  steps:
16
+ - name: Install LuaJIT and Lua
17
+ run: |
18
+ sudo apt-get update
19
+ sudo apt-get install -y --no-install-recommends liblua5.4-dev liblua5.3-dev liblua5.2-dev liblua5.1-0-dev libluajit-5.1-dev
20
  - uses: actions/checkout@v2
21
  - name: Install minimal stable with clippy and rustfmt
22
  uses: actions-rs/toolchain@v1
Cargo.lock CHANGED
@@ -918,9 +918,9 @@ dependencies = [
918
 
919
  [[package]]
920
  name = "error-stack"
921
- version = "0.3.1"
922
  source = "registry+https://github.com/rust-lang/crates.io-index"
923
- checksum = "5f00447f331c7f726db5b8532ebc9163519eed03c6d7c8b73c90b3ff5646ac85"
924
  dependencies = [
925
  "anyhow",
926
  "rustc_version 0.4.0",
 
918
 
919
  [[package]]
920
  name = "error-stack"
921
+ version = "0.4.0"
922
  source = "registry+https://github.com/rust-lang/crates.io-index"
923
+ checksum = "e6a37ef405b504fc3b87a24fa52906d98cdd1a7d4e5ef2b49f0d5fead138fced"
924
  dependencies = [
925
  "anyhow",
926
  "rustc_version 0.4.0",
Cargo.toml CHANGED
@@ -24,7 +24,7 @@ redis = {version="0.23.3"}
24
  md5 = {version="0.7.0"}
25
  rand={version="0.8.5"}
26
  once_cell = {version="1.18.0"}
27
- error-stack = {version="0.3.1"}
28
  async-trait = {version="0.1.73"}
29
  regex = {version="1.9.4", features=["perf"]}
30
 
 
24
  md5 = {version="0.7.0"}
25
  rand={version="0.8.5"}
26
  once_cell = {version="1.18.0"}
27
+ error-stack = {version="0.4.0"}
28
  async-trait = {version="0.1.73"}
29
  regex = {version="1.9.4", features=["perf"]}
30