noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve continuous integration checks (#2070)

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2023-05-30 19:44:47 +01:00 committed by GitHub
parent e1f8722b8c
commit d56a574467
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 41 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/bench.yml vendored
View file

@ -1,6 +1,8 @@
name: Benchmark
on: [pull_request]
on:
push:
pull_request:
defaults:
run:
@ -9,7 +11,7 @@ defaults:
jobs:
bench:
name: Bench library
runs-on: ubuntu-20.04-16-cores
runs-on: ubuntu-latest
steps:
- name: Install stable toolchain
uses: dtolnay/rust-toolchain@stable

25
.github/workflows/ci.yml vendored
View file

@ -2,11 +2,8 @@ name: Continuous integration
on:
push:
branches:
- main
pull_request:
branches:
- main
merge_group:
defaults:
run:
@ -16,7 +13,7 @@ jobs:
format:
name: Check format
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- name: Install stable toolchain
@ -32,7 +29,7 @@ jobs:
check:
name: Check workspace
runs-on: ubuntu-20.04-16-cores
runs-on: ubuntu-latest
steps:
- name: Install stable toolchain
@ -51,7 +48,7 @@ jobs:
check-wasm:
name: Check Wasm
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- name: Install stable toolchain
@ -67,7 +64,7 @@ jobs:
clippy:
name: Check clippy
runs-on: ubuntu-20.04-16-cores
runs-on: ubuntu-latest
steps:
- name: Install stable toolchain
@ -88,7 +85,7 @@ jobs:
test:
name: Test workspace
runs-on: ubuntu-20.04-16-cores
runs-on: ubuntu-latest
steps:
- name: Install stable toolchain
@ -107,7 +104,7 @@ jobs:
ws-engine:
name: WebSocket engine
runs-on: ubuntu-20.04-16-cores
runs-on: ubuntu-latest
steps:
- name: Install stable toolchain
@ -129,7 +126,7 @@ jobs:
http-engine:
name: HTTP engine
runs-on: ubuntu-20.04-16-cores
runs-on: ubuntu-latest
steps:
- name: Install stable toolchain
@ -151,7 +148,7 @@ jobs:
mem-engine:
name: Memory engine
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- name: Install stable toolchain
@ -165,7 +162,7 @@ jobs:
file-engine:
name: File engine
runs-on: ubuntu-20.04-16-cores
runs-on: ubuntu-latest
steps:
- name: Install stable toolchain
@ -179,7 +176,7 @@ jobs:
any-engine:
name: Any engine
runs-on: ubuntu-20.04-16-cores
runs-on: ubuntu-latest
steps:
- name: Install stable toolchain

20
.github/workflows/nightly.yml vendored
View file

@ -13,7 +13,7 @@ jobs:
test:
name: Test
runs-on: ubuntu-20.04-16-cores
runs-on: ubuntu-latest-16-cores
steps:
- name: Checkout sources
@ -34,7 +34,7 @@ jobs:
lint:
name: Lint
runs-on: ubuntu-20.04-16-cores
runs-on: ubuntu-latest-16-cores
steps:
- name: Checkout sources
@ -71,23 +71,23 @@ jobs:
matrix:
include:
- arch: x86_64-apple-darwin
os: macos-12
os: macos-latest-xl
file: surreal-nightly.darwin-amd64
opts: --features storage-tikv
- arch: aarch64-apple-darwin
os: macos-12
os: macos-latest-xl
file: surreal-nightly.darwin-arm64
opts: --features storage-tikv
- arch: x86_64-unknown-linux-gnu
os: ubuntu-20.04-16-cores
os: ubuntu-latest-16-cores
file: surreal-nightly.linux-amd64
opts: --features storage-tikv
- arch: aarch64-unknown-linux-gnu
os: ubuntu-20.04-16-cores
os: ubuntu-latest-16-cores
file: surreal-nightly.linux-arm64
opts: --features storage-tikv
- arch: x86_64-pc-windows-msvc
os: windows-latest-16-cores
os: windows-latest
file: surreal-nightly.windows-amd64
opts:
runs-on: ${{ matrix.os }}
@ -183,7 +183,7 @@ jobs:
package:
name: Package macOS
needs: [build]
runs-on: macos-12
runs-on: macos-latest-xl
steps:
- name: Download amd64 binary
@ -219,7 +219,7 @@ jobs:
deploy:
name: Deploy
needs: [package]
runs-on: ubuntu-20.04-16-cores
runs-on: ubuntu-latest-16-cores
steps:
- name: Checkout sources
@ -246,7 +246,7 @@ jobs:
docker:
name: Docker
needs: [build]
runs-on: ubuntu-20.04-16-cores
runs-on: ubuntu-latest-16-cores
steps:
- name: Checkout sources

5
.github/workflows/nix.yml vendored
View file

@ -1,6 +1,9 @@
name: Nix
on: push
on:
push:
branches:
- main
# Setting the shell option, it will run 'bash --noprofile --norc -eo pipefail {0}'
defaults:

20
.github/workflows/release.yml vendored
View file

@ -13,7 +13,7 @@ jobs:
test:
name: Test
runs-on: ubuntu-20.04-16-cores
runs-on: ubuntu-latest-16-cores
steps:
- name: Checkout sources
@ -34,7 +34,7 @@ jobs:
lint:
name: Lint
runs-on: ubuntu-20.04-16-cores
runs-on: ubuntu-latest-16-cores
steps:
- name: Checkout sources
@ -71,23 +71,23 @@ jobs:
matrix:
include:
- arch: x86_64-apple-darwin
os: macos-12
os: macos-latest-xl
file: surreal-${{ github.ref_name }}.darwin-amd64
opts: --features storage-tikv
- arch: aarch64-apple-darwin
os: macos-12
os: macos-latest-xl
file: surreal-${{ github.ref_name }}.darwin-arm64
opts: --features storage-tikv
- arch: x86_64-unknown-linux-gnu
os: ubuntu-20.04-16-cores
os: ubuntu-latest-16-cores
file: surreal-${{ github.ref_name }}.linux-amd64
opts: --features storage-tikv
- arch: aarch64-unknown-linux-gnu
os: ubuntu-20.04-16-cores
os: ubuntu-latest-16-cores
file: surreal-${{ github.ref_name }}.linux-arm64
opts: --features storage-tikv
- arch: x86_64-pc-windows-msvc
os: windows-latest-16-cores
os: windows-latest
file: surreal-${{ github.ref_name }}.windows-amd64
opts:
runs-on: ${{ matrix.os }}
@ -183,7 +183,7 @@ jobs:
package:
name: Package macOS
needs: [build]
runs-on: macos-12
runs-on: macos-latest-xl
steps:
- name: Download amd64 binary
@ -219,7 +219,7 @@ jobs:
deploy:
name: Deploy
needs: [package]
runs-on: ubuntu-20.04-16-cores
runs-on: ubuntu-latest-16-cores
steps:
- name: Checkout sources
@ -261,7 +261,7 @@ jobs:
docker:
name: Docker
needs: [build]
runs-on: ubuntu-20.04-16-cores
runs-on: ubuntu-latest-16-cores
steps:
- name: Checkout sources

4
tests/cli.rs
View file

@ -112,7 +112,7 @@ mod cli_integration {
let _server = run(&start_args);
std::thread::sleep(std::time::Duration::from_millis(10));
std::thread::sleep(std::time::Duration::from_millis(500));
assert!(run(&format!("isready --conn http://{addr}")).output().is_ok());
@ -280,7 +280,7 @@ mod cli_integration {
let server = run(&start_args);
std::thread::sleep(std::time::Duration::from_millis(50));
std::thread::sleep(std::time::Duration::from_millis(750));
let output = server.kill().output().unwrap_err();
assert!(output.contains("Started web server"), "couldn't start web server: {output}");