0
0
mirror of https://github.com/neon-mmd/websurfx.git synced 2024-11-22 05:58:21 -05:00

Merge branch 'rolling' into optimize-and-make-code-idiomatic-3

This commit is contained in:
neon_arch 2023-08-30 13:36:51 +03:00 committed by GitHub
commit 4a3dac6ec5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 23 deletions

View File

@ -4,10 +4,10 @@ name: Rust
on: on:
push: push:
branches: branches:
- "**" - '**'
pull_request: pull_request:
branches: branches:
- "rolling" - 'rolling'
env: env:
CARGO_TERM_COLOR: always CARGO_TERM_COLOR: always
@ -21,23 +21,26 @@ jobs:
- stable - stable
steps: steps:
- uses: actions/checkout@v3 - uses: leafo/gh-actions-lua@v10
- run: rustup toolchain install stable --profile minimal with:
- uses: Swatinem/rust-cache@v2 luaVersion: 'luajit'
with: - uses: actions/checkout@v3
prefix-key: "" - run: rustup toolchain install stable --profile minimal
shared-key: "" - uses: Swatinem/rust-cache@v2
key: "" with:
env-vars: "" prefix-key: ''
workspaces: "" shared-key: ''
cache-directories: "" key: ''
cache-targets: "" env-vars: ''
cache-on-failure: "" workspaces: ''
cache-all-crates: "" cache-directories: ''
save-if: "" cache-targets: ''
- uses: actions/checkout@v3 cache-on-failure: ''
- run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }} cache-all-crates: ''
- name: Build save-if: ''
run: cargo build --verbose - uses: actions/checkout@v3
- name: Run tests - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
run: cargo test --verbose - name: Build
run: cargo build --verbose
- name: Run tests
run: cargo test --verbose

View File

@ -13,6 +13,9 @@ jobs:
name: Rust project name: Rust project
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: leafo/gh-actions-lua@v10
with:
luaVersion: 'luajit'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install minimal stable with clippy and rustfmt - name: Install minimal stable with clippy and rustfmt
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1

View File

@ -12,7 +12,7 @@ tokio = {version="1.32.0",features=["rt-multi-thread","macros"]}
serde = {version="1.0.188",features=["derive"]} serde = {version="1.0.188",features=["derive"]}
handlebars = { version = "4.3.7", features = ["dir_source"] } handlebars = { version = "4.3.7", features = ["dir_source"] }
scraper = {version="0.17.1"} scraper = {version="0.17.1"}
actix-web = {version="4.3.1", features = ["cookies"]} actix-web = {version="4.4.0", features = ["cookies"]}
actix-files = {version="0.6.2"} actix-files = {version="0.6.2"}
actix-cors = {version="0.6.4"} actix-cors = {version="0.6.4"}
serde_json = {version="1.0.105"} serde_json = {version="1.0.105"}