Skip to content

Refactor files #38

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

Merged
merged 3 commits into from
Sep 19, 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
2 changes: 1 addition & 1 deletion .github/workflows/binary-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:
run: >-
${{ matrix.cross && 'cross' || 'cargo '}}
build
--manifest-path cpp-linter-lib/Cargo.toml
--manifest-path cpp-linter/Cargo.toml
--bin cpp-linter
--release
--target ${{ matrix.target }}
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ jobs:
- name: Install mdbook
uses: taiki-e/install-action@v2
with:
tool: mdbook,cargo-binstall
tool: mdbook,cargo-binstall,just
- name: Install mdbook plugins
run: cargo binstall -y mdbook-alerts
- name: Build book
run: mdbook build docs
run: just docs-build
- name: Upload docs build as artifact
uses: actions/upload-artifact@v4
with:
Expand All @@ -63,7 +63,11 @@ jobs:
with:
path: ~/.cargo
key: ${{ runner.os }}-docs-cargo-${{ hashFiles('Cargo.lock') }}
- run: cargo doc --no-deps --manifest-path cpp-linter-lib/Cargo.toml
- name: Install mdbook
uses: taiki-e/install-action@v2
with:
tool: just
- run: just docs-rs
- name: upload rustdoc build as artifact
uses: actions/upload-artifact@v4
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/python-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.target }}
args: --manifest-path cpp-linter-py/Cargo.toml --release --out dist --find-interpreter ${{ steps.is-openssl-vendored.outputs.enabled }}
args: --manifest-path py-binding/Cargo.toml --release --out dist --find-interpreter ${{ steps.is-openssl-vendored.outputs.enabled }}
manylinux: auto
before-script-linux: |
case "${{ matrix.target }}" in
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.target }}
args: --manifest-path cpp-linter-py/Cargo.toml --release --out dist --find-interpreter
args: --manifest-path py-binding/Cargo.toml --release --out dist --find-interpreter
- name: Upload wheels
uses: actions/upload-artifact@v4
with:
Expand All @@ -112,7 +112,7 @@ jobs:
uses: PyO3/maturin-action@v1
with:
target: ${{ matrix.target }}
args: --manifest-path cpp-linter-py/Cargo.toml --release --out dist --find-interpreter --features openssl-vendored
args: --manifest-path py-binding/Cargo.toml --release --out dist --find-interpreter --features openssl-vendored
- name: Upload wheels
uses: actions/upload-artifact@v4
with:
Expand All @@ -127,7 +127,7 @@ jobs:
uses: PyO3/maturin-action@v1
with:
command: sdist
args: --manifest-path cpp-linter-py/Cargo.toml --out dist
args: --manifest-path py-binding/Cargo.toml --out dist
- name: Upload sdist
uses: actions/upload-artifact@v4
with:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/run-dev-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,9 @@ jobs:

- name: Generate Coverage lcov report
if: runner.os == 'Linux'
run: just lcov
run: |
rm coverage.json
just lcov

- uses: codecov/codecov-action@v4
if: runner.os == 'Linux'
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ repos:
rev: v4.6.0
hooks:
- id: trailing-whitespace
exclude: cpp-linter-lib/tests/.*\.(?:patch|diff)
exclude: cpp-linter/tests/.*\.(?:patch|diff)
- id: end-of-file-fixer
- id: check-docstring-first
- id: check-added-large-files
Expand Down
6 changes: 3 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[workspace]
members = ["cpp-linter-lib", "cpp-linter-py", "docs"]
members = ["cpp-linter", "py-binding", "docs"]
resolver = "2"

[workspace.package]
Expand Down
Loading