Skip to content
New issue

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

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

Already on GitHub? # to your account

Upgrade tooling and dependencies #83

Merged
merged 3 commits into from
Feb 22, 2024
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
12 changes: 8 additions & 4 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,12 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: Run pre-commit
uses: pre-commit/action@v2.0.3
python-version: "3.12.1"
- name: Install dependencies
run: |
pip install --upgrade pip
pip install pre-commit
- name: Lint
run: pre-commit run --all-files --show-diff-on-failure
23 changes: 12 additions & 11 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ jobs:
- RELEASE=1
fail-fast: false
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
name: Setup Rust
- uses: actions/checkout@v4
- name: Setup Rust
uses: hecrj/setup-rust-action@v2
with:
rust-version: stable
profile: minimal
toolchain: stable
- uses: actions/setup-node@v2
- uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "20"
- name: Update NPM
run: npm install npm@latest -g
- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: |
~/.cargo/registry
Expand All @@ -41,6 +41,7 @@ jobs:
run: SOURCING=1 . run && ${{ matrix.test-args }} build_client
- name: Compile and run tests
run: TESTS=server ${{ matrix.test-args }} ./test

test-client:
name: Test client
runs-on: ubuntu-latest
Expand All @@ -51,14 +52,14 @@ jobs:
- RELEASE=1
fail-fast: false
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "20"
- name: Update NPM
run: npm install npm@latest -g
- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/client/package-lock.json') }}-${{ matrix.test-args }}
Expand Down
13 changes: 6 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
repos:
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
rev: v2.11.0
- repo: https://github.com/doublify/pre-commit-rust
rev: v1.0
hooks:
- id: pretty-format-rust
name: rustfmt
args:
- --autofix
- id: fmt
- id: cargo-check
- id: clippy
- repo: https://github.com/jumanjihouse/pre-commit-hooks
rev: 3.0.0
hooks:
- id: shellcheck
name: shellcheck
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.0.3
rev: v4.0.0-alpha.8
hooks:
- id: prettier
name: prettier
Loading