dnrops
/
meilisearch
mirror of https://github.com/meilisearch/meilisearch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge #2867 

2867: Bring back `stable` into `main` r=Kerollmops a=curquiza

Following hotfix for v0.29.1

Co-authored-by: Loïc Lecrenier <loic@meilisearch.com>
Co-authored-by: Clémentine Urquizar <clementine@meilisearch.com>
Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
This commit is contained in:
bors[bot] 2022-10-06 14:14:23 +00:00 committed by GitHub
parent c98d3209ad ed6c2fb22c
commit 1b72eba1f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/coverage.yml vendored
View File

@ -6,7 +6,7 @@ name: Execute code coverage
jobs:
nightly-coverage:
runs-on: ubuntu-20.04
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1

2
.github/workflows/flaky.yml vendored
View File

@ -5,7 +5,7 @@ on:
jobs:
flaky:
runs-on: ubuntu-20.04
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v3

6
.github/workflows/publish-binaries.yml vendored
View File

@ -38,9 +38,9 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, macos-latest, windows-latest]
os: [ubuntu-18.04, macos-latest, windows-latest]
include:
- os: ubuntu-20.04
- os: ubuntu-18.04
artifact_name: meilisearch
asset_name: meilisearch-linux-amd64
- os: macos-latest
@ -115,7 +115,7 @@ jobs:
matrix:
include:
- build: aarch64
os: ubuntu-20.04
os: ubuntu-18.04
target: aarch64-unknown-linux-gnu
linker: gcc-aarch64-linux-gnu
use-cross: true

4
.github/workflows/publish-deb-brew-pkg.yml vendored
View File

@ -15,7 +15,7 @@ jobs:
debian:
name: Publish debian packagge
runs-on: ubuntu-20.04
runs-on: ubuntu-18.04
needs: check-version
steps:
- uses: hecrj/setup-rust-action@master
@ -38,7 +38,7 @@ jobs:
homebrew:
name: Bump Homebrew formula
runs-on: ubuntu-20.04
runs-on: ubuntu-18.04
needs: check-version
steps:
- name: Create PR to Homebrew

24
.github/workflows/rust.yml vendored
View File

@ -21,11 +21,11 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, macos-latest, windows-latest]
os: [ubuntu-18.04, macos-latest, windows-latest]
steps:
- uses: actions/checkout@v3
- name: Cache dependencies
uses: Swatinem/rust-cache@v2.0.0
# - name: Cache dependencies
# uses: Swatinem/rust-cache@v2.0.0
- name: Run cargo check without any default features
uses: actions-rs/cargo@v1
with:
@ -40,7 +40,7 @@ jobs:
# We run tests in debug also, to make sure that the debug_assertions are hit
test-debug:
name: Run tests in debug
runs-on: ubuntu-20.04
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
@ -48,8 +48,8 @@ jobs:
profile: minimal
toolchain: stable
override: true
- name: Cache dependencies
uses: Swatinem/rust-cache@v2.0.0
# - name: Cache dependencies
# uses: Swatinem/rust-cache@v2.0.0
- name: Run tests in debug
uses: actions-rs/cargo@v1
with:
@ -58,7 +58,7 @@ jobs:
clippy:
name: Run Clippy
runs-on: ubuntu-20.04
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
@ -67,8 +67,8 @@ jobs:
toolchain: stable
override: true
components: clippy
- name: Cache dependencies
uses: Swatinem/rust-cache@v2.0.0
# - name: Cache dependencies
# uses: Swatinem/rust-cache@v2.0.0
- name: Run cargo clippy
uses: actions-rs/cargo@v1
with:
@ -77,7 +77,7 @@ jobs:
fmt:
name: Run Rustfmt
runs-on: ubuntu-20.04
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
@ -86,7 +86,7 @@ jobs:
toolchain: stable
override: true
components: rustfmt
- name: Cache dependencies
uses: Swatinem/rust-cache@v2.0.0
# - name: Cache dependencies
# uses: Swatinem/rust-cache@v2.0.0
- name: Run cargo fmt
run: cargo fmt --all -- --check

2
.github/workflows/update-cargo-toml-version.yml vendored
View File

@ -16,7 +16,7 @@ jobs:
update-version-cargo-toml:
name: Update version in Cargo.toml files
runs-on: ubuntu-20.04
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1

10
Cargo.lock generated
View File

@ -2018,7 +2018,7 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
[[package]]
name = "meilisearch-auth"
version = "0.29.0"
version = "0.29.1"
dependencies = [
"enum-iterator",
"hmac",
@ -2035,7 +2035,7 @@ dependencies = [
[[package]]
name = "meilisearch-http"
version = "0.29.0"
version = "0.29.1"
dependencies = [
"actix-cors",
"actix-rt",
@ -2111,7 +2111,7 @@ dependencies = [
[[package]]
name = "meilisearch-lib"
version = "0.29.0"
version = "0.29.1"
dependencies = [
"actix-rt",
"actix-web",
@ -2174,7 +2174,7 @@ dependencies = [
[[package]]
name = "meilisearch-types"
version = "0.29.0"
version = "0.29.1"
dependencies = [
"actix-web",
"proptest",
@ -2573,7 +2573,7 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
[[package]]
name = "permissive-json-pointer"
version = "0.29.0"
version = "0.29.1"
dependencies = [
"big_s",
"serde_json",

2
bors.toml
View File

@ -1,5 +1,5 @@
status = [
'Tests on ubuntu-20.04',
'Tests on ubuntu-18.04',
'Tests on macos-latest',
'Tests on windows-latest',
'Run Clippy',

2
meilisearch-auth/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "meilisearch-auth"
version = "0.29.0"
version = "0.29.1"
edition = "2021"
[dependencies]

2
meilisearch-http/Cargo.toml
View File

@ -4,7 +4,7 @@ description = "Meilisearch HTTP server"
edition = "2021"
license = "MIT"
name = "meilisearch-http"
version = "0.29.0"
version = "0.29.1"
[[bin]]
name = "meilisearch"

2
meilisearch-lib/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "meilisearch-lib"
version = "0.29.0"
version = "0.29.1"
edition = "2021"
[dependencies]

2
meilisearch-types/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "meilisearch-types"
version = "0.29.0"
version = "0.29.1"
authors = ["marin <postma.marin@protonmail.com>"]
edition = "2021"

2
permissive-json-pointer/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "permissive-json-pointer"
version = "0.29.0"
version = "0.29.1"
edition = "2021"
description = "A permissive json pointer"
readme = "README.md"