Skip to content

Commit 9189e86

Browse files
committed
prepare for v2.0.0-rc1
1 parent 4a07239 commit 9189e86

File tree

12 files changed

+36
-35
lines changed

12 files changed

+36
-35
lines changed

.github/workflows/binary-builds.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ jobs:
152152
GH_TOKEN: ${{ github.token }}
153153
run: |
154154
files=$(ls dist/cpp-linter*)
155-
gh release create ${{ github.ref_name }} --generate-notes $files
156-
- run: cargo publish
155+
gh release create ${{ github.ref_name }} ${{ contains(github.ref_name, 'rc') && '--prerelease' || '' }} --generate-notes $files
156+
- run: cargo publish -p cpp-linter-lib
157157
working-directory: cpp-linter-lib
158158
env:
159159
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}

.github/workflows/python-packaging.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,9 @@ jobs:
150150
- name: Publish to PyPI
151151
uses: PyO3/maturin-action@v1
152152
env:
153-
MATURIN_PYPI_TOKEN: ${{ contains(github.ref_name, 'rc') && secrets.TEST_PYPI_API_TOKEN || secrets.PYPI_API_TOKEN }}
153+
# This workflow id registered as a trusted publisher (for test-pypi and pypi).
154+
# A token should not be required (and actually is discouraged with trusted publishers).
155+
# MATURIN_PYPI_TOKEN: ${{ contains(github.ref_name, 'rc') && secrets.TEST_PYPI_API_TOKEN || secrets.PYPI_API_TOKEN }}
154156
MATURIN_REPOSITORY: ${{ contains(github.ref_name, 'rc') && 'test-pypi' || 'pypi' }}
155157
with:
156158
command: upload

Cargo.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ members = ["cpp-linter-lib", "cpp-linter-py", "docs"]
55
resolver = "2"
66

77
[workspace.package]
8-
version = "2.0.0" # auto
8+
version = "2.0.0-rc1" # auto
99
authors = [
1010
"Brendan Doherty",
1111
"Peter Shen",
1212
]
1313
description = "Run clang-format and clang-tidy on a batch of files."
14-
documentation = "https://cpp-linter.github.io/cpp_linter_rs"
14+
homepage = "https://cpp-linter.github.io/cpp_linter_rs"
15+
license = "MIT"

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2023 2bndy5
3+
Copyright (c) 2024 2bndy5
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
66

cpp-linter-lib/Cargo.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
[package]
22
name = "cpp-linter-lib"
33
edition = "2021"
4+
repository = "https://github.com/cpp-linter/cpp_linter_rs/tree/main/cpp-linter-lib"
5+
readme = "README.md"
46
version.workspace = true
57
authors.workspace = true
68
description.workspace = true
7-
documentation.workspace = true
9+
homepage.workspace = true
10+
license.workspace = true
11+
812
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
913

1014
[dependencies]

cpp-linter-lib/LICENSE

Lines changed: 0 additions & 9 deletions
This file was deleted.

cpp-linter-lib/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This crate contains the the library used as a backend for the
1010
- [x] step summary
1111
- [x] thread comments
1212
- [x] file annotation
13-
- [ ] pull request review suggestions
13+
- [x] pull request review suggestions
1414

1515
Since the [cpp-linter python package][pypi-org] now uses this library
1616
as a binding, the native binary's `main()` behavior is also present in this

cpp-linter-py/Cargo.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
[package]
22
name = "cpp-linter-py"
33
edition = "2021"
4+
readme = "README.md"
5+
repository = "https://github.com/cpp-linter/cpp_linter_rs/tree/main/cpp-linter-py"
46
version.workspace = true
57
authors.workspace = true
68
description.workspace = true
7-
documentation.workspace = true
9+
homepage.workspace = true
10+
license.workspace = true
811

912
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
13+
1014
[lib]
1115
name = "cpp_linter"
1216
crate-type = ["cdylib"]
1317

1418
[dependencies]
1519
pyo3 = { version = "0.22.3", features = ["extension-module"] }
16-
cpp-linter-lib = { path = "../cpp-linter-lib", version = "*" }
20+
cpp-linter-lib = { path = "../cpp-linter-lib" }
1721
tokio = "1.40.0"
1822

1923
[features]

cpp-linter-py/LICENSE

Lines changed: 0 additions & 9 deletions
This file was deleted.

docs/Cargo.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
[package]
33
name = "cli-gen"
44
edition = "2021"
5-
version.workspace = true
5+
version = "0.1.0"
6+
description = "A mdbook pre-processor that generates a CLI doc from source code."
67
authors.workspace = true
7-
description.workspace = true
8-
documentation.workspace = true
8+
homepage.workspace = true
9+
license.workspace = true
910

1011
[dependencies]
11-
cpp-linter-lib = { path = "../cpp-linter-lib", version = "*" }
12+
cpp-linter-lib = { path = "../cpp-linter-lib" }
1213
clap = "4.5.17"
1314
mdbook = "0.4.40"
1415
semver = "1.0.23"

install-clang-action/README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# cpp-linter/cpp_linter_rs/install-clang-action
2+
3+
This is action is not meant to be published in the GitHub marketplace.
4+
It intended to be a repo-specific action for installing multiple versions of
5+
clang-format and clang-tidy ina single workflow run.
6+
7+
This is used in the cpp-linter-lib tests only.

0 commit comments

Comments
 (0)