mirror of
https://github.com/neon-mmd/websurfx.git
synced 2024-11-21 21:48:21 -05:00
Merge branch 'rolling' into feat-disallow-user-to-search-via-lists
This commit is contained in:
commit
15d52b519b
28
.github/workflows/rust.yml
vendored
28
.github/workflows/rust.yml
vendored
@ -4,10 +4,10 @@ name: Rust
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- "**"
|
||||
- '**'
|
||||
pull_request:
|
||||
branches:
|
||||
- "rolling"
|
||||
- 'rolling'
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
@ -21,20 +21,24 @@ jobs:
|
||||
- stable
|
||||
|
||||
steps:
|
||||
- name: Install LuaJIT and Lua
|
||||
run: |
|
||||
sudo apt-get update
|
||||
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
|
||||
- uses: actions/checkout@v3
|
||||
- run: rustup toolchain install stable --profile minimal
|
||||
- uses: Swatinem/rust-cache@v2
|
||||
with:
|
||||
prefix-key: ""
|
||||
shared-key: ""
|
||||
key: ""
|
||||
env-vars: ""
|
||||
workspaces: ""
|
||||
cache-directories: ""
|
||||
cache-targets: ""
|
||||
cache-on-failure: ""
|
||||
cache-all-crates: ""
|
||||
save-if: ""
|
||||
prefix-key: ''
|
||||
shared-key: ''
|
||||
key: ''
|
||||
env-vars: ''
|
||||
workspaces: ''
|
||||
cache-directories: ''
|
||||
cache-targets: ''
|
||||
cache-on-failure: ''
|
||||
cache-all-crates: ''
|
||||
save-if: ''
|
||||
- uses: actions/checkout@v3
|
||||
- run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
|
||||
- name: Build
|
||||
|
4
.github/workflows/rust_format.yml
vendored
4
.github/workflows/rust_format.yml
vendored
@ -13,6 +13,10 @@ jobs:
|
||||
name: Rust project
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Install LuaJIT and Lua
|
||||
run: |
|
||||
sudo apt-get update
|
||||
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
|
||||
- uses: actions/checkout@v2
|
||||
- name: Install minimal stable with clippy and rustfmt
|
||||
uses: actions-rs/toolchain@v1
|
||||
|
4
Cargo.lock
generated
4
Cargo.lock
generated
@ -918,9 +918,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "error-stack"
|
||||
version = "0.3.1"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5f00447f331c7f726db5b8532ebc9163519eed03c6d7c8b73c90b3ff5646ac85"
|
||||
checksum = "e6a37ef405b504fc3b87a24fa52906d98cdd1a7d4e5ef2b49f0d5fead138fced"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"rustc_version 0.4.0",
|
||||
|
@ -24,7 +24,7 @@ redis = {version="0.23.3"}
|
||||
md5 = {version="0.7.0"}
|
||||
rand={version="0.8.5"}
|
||||
once_cell = {version="1.18.0"}
|
||||
error-stack = {version="0.3.1"}
|
||||
error-stack = {version="0.4.0"}
|
||||
async-trait = {version="0.1.73"}
|
||||
regex = {version="1.9.4", features=["perf"]}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user