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

Helm Chart - Tweaks & Fixes #154

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open
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
32 changes: 5 additions & 27 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Adding component
run: rustup component add rustfmt
- name: Checking code format
run: cargo fmt -- --check --config use_try_shorthand=true,imports_granularity=Crate
run: cargo fmt -- --check

code_check:
needs: pre_job
Expand All @@ -49,33 +49,12 @@ jobs:
- uses: actions-rs/clippy-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
args: --all-features -p rustus -- -W clippy::all -W clippy::pedantic -D warnings
args: --all-features -p rustus -- -W clippy::all -W clippy::pedantic -D warnings -A clippy::module_name_repetitions

tests:
needs: pre_job
if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
runs-on: ubuntu-latest
services:
redis:
image: redis:6.2-alpine3.15
ports:
- 6379/tcp
pg:
image: postgres:13.1
ports:
- 5432/tcp
env:
POSTGRES_PASSWORD: "rustus"
POSTGRES_USER: "rustus"
POSTGRES_DB: "rustus"
rabbit:
image: rabbitmq:3.8.27-alpine
ports:
- 5672/tcp
env:
RABBITMQ_DEFAULT_USER: "guest"
RABBITMQ_DEFAULT_PASS: "guest"
RABBITMQ_DEFAULT_VHOST: "/"
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -86,8 +65,7 @@ jobs:
toolchain: stable
override: true
- name: Run tests
run: cargo test --features=all,integration_tests -- --test-threads 1
run: cargo test -- --test-threads 1
env:
TEST_REDIS_URL: redis://localhost:${{ job.services.redis.ports['6379'] }}/0
TEST_DB_URL: postgresql://rustus:rustus@localhost:${{ job.services.pg.ports['5432'] }}/rustus
TEST_AMQP_URL: amqp://guest:guest@localhost:${{ job.services.rabbit.ports['5672'] }}
TEST_REDIS_URL: redis://localhost:6479/0
TEST_AMQP_URL: amqp://guest:guest@localhost:5672/
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ data/
tarpaulin-report.html
lcov.info
site
.venv/
.virtualenv/
16 changes: 3 additions & 13 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ repos:
- fmt
- --
- --config
- use_try_shorthand=true,imports_granularity=Crate
- use_try_shorthand=true

- id: clippy
types:
Expand All @@ -27,7 +27,6 @@ repos:
entry: cargo
args:
- clippy
- --features=all
- --all
- -p
- rustus
Expand All @@ -38,6 +37,8 @@ repos:
- clippy::pedantic
- -D
- warnings
- -A
- clippy::module_name_repetitions

- id: check
types:
Expand All @@ -48,14 +49,3 @@ repos:
pass_filenames: false
args:
- check

- id: check-all
types:
- rust
name: cargo check all
language: system
entry: cargo
pass_filenames: false
args:
- check
- --features=all
1 change: 1 addition & 0 deletions .rustfmt.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use_try_shorthand=true
Loading
Loading