Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[server] Fix deadlock in tests when run in release mode #1034 #1035

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions .github/workflows/agdb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ on:
pull_request:
branches: ["main"]

env:
PROJECT: agdb

jobs:
diff:
runs-on: ubuntu-latest
Expand All @@ -19,7 +16,7 @@ jobs:
- id: diff
shell: bash
run: |
if [[ "$(git diff origin/main --name-only -- ${{ env.PROJECT }}/ agdb_derive/ .github/workflows/${{ env.PROJECT }}.yaml)" != "" ]]; then (echo "diff=true" >> $GITHUB_OUTPUT); fi
if [[ "$(git diff origin/main --name-only -- agdb/ agdb_derive/ .github/workflows/agdb.yaml)" != "" ]]; then (echo "diff=true" >> $GITHUB_OUTPUT); fi

agdb_analyse:
runs-on: ubuntu-latest
Expand All @@ -28,7 +25,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: cargo clippy --package ${{ env.PROJECT }} --package agdb_derive --all-targets --all-features -- -D warnings
- run: cargo clippy --package agdb --package agdb_derive --all-targets --all-features -- -D warnings

agdb_coverage:
runs-on: ubuntu-latest
Expand All @@ -39,7 +36,7 @@ jobs:
- uses: actions-rust-lang/setup-rust-toolchain@v1
- uses: taiki-e/install-action@cargo-llvm-cov
- run: rustup component add llvm-tools-preview
- run: cargo llvm-cov --package ${{ env.PROJECT }} --package agdb_derive --all-features --ignore-filename-regex "agdb_derive" --fail-uncovered-functions 0 --fail-uncovered-lines 0 --show-missing-lines
- run: cargo llvm-cov --package agdb --package agdb_derive --all-features --ignore-filename-regex "agdb_derive" --fail-uncovered-functions 0 --fail-uncovered-lines 1 --show-missing-lines

agdb_format:
runs-on: ubuntu-latest
Expand All @@ -48,4 +45,4 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: cargo fmt --package ${{ env.PROJECT }} --package agdb_derive --check
- run: cargo fmt --package agdb --package agdb_derive --check
11 changes: 4 additions & 7 deletions .github/workflows/agdb_api_rust.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ on:
pull_request:
branches: ["main"]

env:
PROJECT: agdb_api

jobs:
diff:
runs-on: ubuntu-latest
Expand All @@ -19,7 +16,7 @@ jobs:
- id: diff
shell: bash
run: |
if [[ "$(git diff origin/main --name-only -- agdb_api/rust agdb/ agdb_derive/ .github/workflows/${{ env.PROJECT }}_rust.yaml)" != "" ]]; then (echo "diff=true" >> $GITHUB_OUTPUT); fi
if [[ "$(git diff origin/main --name-only -- agdb_api/rust agdb/ agdb_derive/ .github/workflows/agdb_api_rust.yaml)" != "" ]]; then (echo "diff=true" >> $GITHUB_OUTPUT); fi

agdb_api_rust_analyse:
runs-on: ubuntu-latest
Expand All @@ -28,7 +25,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: cargo clippy --package ${{ env.PROJECT }} --all-targets --all-features -- -D warnings
- run: cargo clippy --package agdb_api --all-targets --all-features -- -D warnings

agdb_api_rust_coverage:
runs-on: ubuntu-latest
Expand All @@ -39,7 +36,7 @@ jobs:
- uses: actions-rust-lang/setup-rust-toolchain@v1
- uses: taiki-e/install-action@cargo-llvm-cov
- run: rustup component add llvm-tools-preview
- run: cargo llvm-cov --package ${{ env.PROJECT }} --package agdb_server --all-features --ignore-filename-regex "agdb(.|..)src|agdb_server|agdb_derive" --fail-uncovered-functions 0 --fail-uncovered-lines 0 --show-missing-lines
- run: cargo llvm-cov --package agdb_api --package agdb_server --all-features --ignore-filename-regex "agdb(.|..)src|agdb_server|agdb_derive" --fail-uncovered-functions 0 --fail-uncovered-lines 0 --show-missing-lines

agdb_api_rust_format:
runs-on: ubuntu-latest
Expand All @@ -48,4 +45,4 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: cargo fmt --package ${{ env.PROJECT }} --check
- run: cargo fmt --package agdb_api --check
13 changes: 5 additions & 8 deletions .github/workflows/agdb_api_typescript.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ on:
pull_request:
branches: ["main"]

env:
PROJECT: agdb_api/typescript

jobs:
diff:
runs-on: ubuntu-latest
Expand All @@ -19,15 +16,15 @@ jobs:
- id: diff
shell: bash
run: |
if [[ "$(git diff origin/main --name-only -- ${{ env.PROJECT }}/ agdb_server/openapi/schema.json .github/workflows/agdb_api_typescript.yaml)" != "" ]]; then (echo "diff=true" >> $GITHUB_OUTPUT); fi
if [[ "$(git diff origin/main --name-only -- agdb_api/typescript/ agdb_server/openapi/schema.json .github/workflows/agdb_api_typescript.yaml)" != "" ]]; then (echo "diff=true" >> $GITHUB_OUTPUT); fi

agdb_api_typescript_analyse:
runs-on: ubuntu-latest
needs: diff
if: needs.diff.outputs.diff == 'true'
defaults:
run:
working-directory: ${{ env.PROJECT }}
working-directory: agdb_api/typescript
steps:
- uses: actions/checkout@v4
- run: npm ci
Expand All @@ -39,7 +36,7 @@ jobs:
if: needs.diff.outputs.diff == 'true'
defaults:
run:
working-directory: ${{ env.PROJECT }}
working-directory: agdb_api/typescript
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
Expand All @@ -49,7 +46,7 @@ jobs:
if: always()
with:
name: coverage
path: ${{ env.PROJECT }}/coverage/
path: agdb_api/typescript/coverage/
retention-days: 30

agdb_api_typescript_format:
Expand All @@ -58,7 +55,7 @@ jobs:
if: needs.diff.outputs.diff == 'true'
defaults:
run:
working-directory: ${{ env.PROJECT }}
working-directory: agdb_api/typescript
steps:
- uses: actions/checkout@v4
- run: npm ci
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/agdb_benchmarks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ on:
pull_request:
branches: ["main"]

env:
PROJECT: agdb_benchmarks

jobs:
diff:
runs-on: ubuntu-latest
Expand All @@ -19,7 +16,7 @@ jobs:
- id: diff
shell: bash
run: |
if [[ "$(git diff origin/main --name-only -- ${{ env.PROJECT }}/ agdb/src/ agdb/src/Cargo.toml agdb_derive/src/ agdb_derive/Cargo.toml .github/workflows/${{ env.PROJECT }}.yaml)" != "" ]]; then (echo "diff=true" >> $GITHUB_OUTPUT); fi
if [[ "$(git diff origin/main --name-only -- agdb_benchmarks/ agdb/src/ agdb/src/Cargo.toml agdb_derive/src/ agdb_derive/Cargo.toml .github/workflows/agdb_benchmarks.yaml)" != "" ]]; then (echo "diff=true" >> $GITHUB_OUTPUT); fi

agdb_benchmarks:
runs-on: ubuntu-latest
Expand All @@ -28,7 +25,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: cargo run --release --package ${{ env.PROJECT }}
- run: cargo run --release --package agdb_benchmarks

agdb_benchmarks_analyse:
runs-on: ubuntu-latest
Expand All @@ -37,7 +34,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: cargo clippy --package ${{ env.PROJECT }} --all-targets --all-features -- -D warnings
- run: cargo clippy --package agdb_benchmarks --all-targets --all-features -- -D warnings

agdb_benchmarks_format:
runs-on: ubuntu-latest
Expand All @@ -46,4 +43,4 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: cargo fmt --package ${{ env.PROJECT }} --check
- run: cargo fmt --package agdb_benchmarks --check
11 changes: 4 additions & 7 deletions .github/workflows/agdb_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ on:
pull_request:
branches: ["main"]

env:
PROJECT: agdb_ci

jobs:
diff:
runs-on: ubuntu-latest
Expand All @@ -19,7 +16,7 @@ jobs:
- id: diff
shell: bash
run: |
if [[ "$(git diff origin/main --name-only -- ${{ env.PROJECT }}/ .github/workflows/${{ env.PROJECT }}.yaml Version)" != "" ]]; then (echo "diff=true" >> $GITHUB_OUTPUT); fi
if [[ "$(git diff origin/main --name-only -- agdb_ci/ .github/workflows/agdb_ci.yaml Version)" != "" ]]; then (echo "diff=true" >> $GITHUB_OUTPUT); fi

agdb_ci_analyse:
runs-on: ubuntu-latest
Expand All @@ -28,7 +25,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: cargo clippy --package ${{ env.PROJECT }} --all-targets --all-features -- -D warnings
- run: cargo clippy --package agdb_ci --all-targets --all-features -- -D warnings

agdb_ci_coverage:
runs-on: ubuntu-latest
Expand All @@ -39,7 +36,7 @@ jobs:
- uses: actions-rust-lang/setup-rust-toolchain@v1
- uses: taiki-e/install-action@cargo-llvm-cov
- run: rustup component add llvm-tools-preview
- run: cargo llvm-cov --package ${{ env.PROJECT }} --all-features --fail-uncovered-functions 0 --fail-uncovered-lines 0 --show-missing-lines
- run: cargo llvm-cov --package agdb_ci --all-features --fail-uncovered-functions 0 --fail-uncovered-lines 0 --show-missing-lines

agdb_ci_format:
runs-on: ubuntu-latest
Expand All @@ -48,7 +45,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: cargo fmt --package ${{ env.PROJECT }} --check
- run: cargo fmt --package agdb_ci --check

validate_version:
runs-on: ubuntu-latest
Expand Down
21 changes: 14 additions & 7 deletions .github/workflows/agdb_server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ on:
pull_request:
branches: ["main"]

env:
PROJECT: agdb_server

jobs:
diff:
runs-on: ubuntu-latest
Expand All @@ -19,7 +16,7 @@ jobs:
- id: diff
shell: bash
run: |
if [[ "$(git diff origin/main --name-only -- ${{ env.PROJECT }}/ agdb/src/ agdb/Cargo.toml agdb_derive/src/ agdb_derive/Cargo.toml .github/workflows/${{ env.PROJECT }}.yaml)" != "" ]]; then (echo "diff=true" >> $GITHUB_OUTPUT); fi
if [[ "$(git diff origin/main --name-only -- agdb_server/ agdb/src/ agdb/Cargo.toml agdb_derive/src/ agdb_derive/Cargo.toml .github/workflows/agdb_server.yaml)" != "" ]]; then (echo "diff=true" >> $GITHUB_OUTPUT); fi

agdb_server_analyse:
runs-on: ubuntu-latest
Expand All @@ -28,7 +25,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: cargo clippy --package ${{ env.PROJECT }} --all-targets --all-features -- -D warnings
- run: cargo clippy --package agdb_server --all-targets --all-features -- -D warnings

agdb_server_coverage:
runs-on: ubuntu-latest
Expand All @@ -39,7 +36,17 @@ jobs:
- uses: actions-rust-lang/setup-rust-toolchain@v1
- uses: taiki-e/install-action@cargo-llvm-cov
- run: rustup component add llvm-tools-preview
- run: cargo llvm-cov --package ${{ env.PROJECT }} --all-features --ignore-filename-regex "agdb(.|..)src|agdb_derive|agdb_api|api.rs" --fail-uncovered-functions 0 --fail-uncovered-lines 0 --show-missing-lines
- run: cargo llvm-cov --package agdb_server --all-features --ignore-filename-regex "agdb(.|..)src|agdb_derive|agdb_api|api.rs" --fail-uncovered-functions 0 --show-missing-lines

agdb_server_test:
runs-on: ubuntu-latest
needs: diff
if: needs.diff.outputs.diff == 'true'
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: cargo test --package agdb_server
- run: cargo test --release --package agdb_server

agdb_server_format:
runs-on: ubuntu-latest
Expand All @@ -48,4 +55,4 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
- run: cargo fmt --package ${{ env.PROJECT }} --check
- run: cargo fmt --package agdb_server --check
17 changes: 7 additions & 10 deletions .github/workflows/agdb_studio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ on:
pull_request:
branches: ["main"]

env:
PROJECT: agdb_studio

jobs:
diff:
runs-on: ubuntu-latest
Expand All @@ -19,15 +16,15 @@ jobs:
- id: diff
shell: bash
run: |
if [[ "$(git diff origin/main --name-only -- ${{ env.PROJECT }}/ agdb_api/typescript/src/ agdb_api/typescript/package.json agdb_server/openapi/schema.json .github/workflows/${{ env.PROJECT }}.yaml)" != "" ]]; then (echo "diff=true" >> $GITHUB_OUTPUT); fi
if [[ "$(git diff origin/main --name-only -- agdb_studio/ agdb_api/typescript/src/ agdb_api/typescript/package.json agdb_server/openapi/schema.json .github/workflows/agdb_studio.yaml)" != "" ]]; then (echo "diff=true" >> $GITHUB_OUTPUT); fi

agdb_studio_analyse:
runs-on: ubuntu-latest
needs: diff
if: needs.diff.outputs.diff == 'true'
defaults:
run:
working-directory: ${{ env.PROJECT }}
working-directory: agdb_studio
steps:
- uses: actions/checkout@v4
- run: npm ci
Expand All @@ -39,7 +36,7 @@ jobs:
if: needs.diff.outputs.diff == 'true'
defaults:
run:
working-directory: ${{ env.PROJECT }}
working-directory: agdb_studio
steps:
- uses: actions/checkout@v4
- run: npm ci
Expand All @@ -48,7 +45,7 @@ jobs:
if: always()
with:
name: coverage
path: ${{ env.PROJECT }}/coverage/
path: agdb_studio/coverage/
retention-days: 30

agdb_studio_e2e:
Expand All @@ -57,7 +54,7 @@ jobs:
if: needs.diff.outputs.diff == 'true'
defaults:
run:
working-directory: ${{ env.PROJECT }}
working-directory: agdb_studio
steps:
- uses: actions/checkout@v4
- run: npm ci
Expand All @@ -68,7 +65,7 @@ jobs:
if: always()
with:
name: e2e
path: ${{ env.PROJECT }}/playwright-report/
path: agdb_studio/playwright-report/
retention-days: 30

agdb_studio_format:
Expand All @@ -77,7 +74,7 @@ jobs:
if: needs.diff.outputs.diff == 'true'
defaults:
run:
working-directory: ${{ env.PROJECT }}
working-directory: agdb_studio
steps:
- uses: actions/checkout@v4
- run: npm ci
Expand Down
Loading
Loading