Skip to content

Commit

Permalink
Cleanup (#22)
Browse files Browse the repository at this point in the history
* Bump sentry-core

* Fix clippy

* Cleanup CI

* Oops

* Fixup
  • Loading branch information
Jake-Shadle authored Dec 16, 2022
1 parent 3f5915c commit a404bc6
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 36 deletions.
40 changes: 18 additions & 22 deletions .github/workflows/rust-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,20 @@ name: CI
jobs:
lint:
name: Lint
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true
- uses: actions-rs/toolchain@v1
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: stable
override: true

components: "clippy, rustfmt"
- uses: Swatinem/rust-cache@v2
# make sure all code has been formatted with rustfmt
- run: rustup component add rustfmt
- name: check rustfmt
run: cargo fmt -- --check --color always

# run clippy to verify we have no warnings
- run: rustup component add clippy
- run: cargo fetch
- name: cargo clippy
run: cargo clippy --all-targets -- -D warnings
Expand All @@ -33,39 +30,38 @@ jobs:
name: Test
strategy:
matrix:
os: [ubuntu-20.04, windows-latest, macOS-latest]
os: [ubuntu-22.04, windows-latest, macOS-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- run: cargo fetch
- name: build
run: cargo build --manifest-path breakpad-sys/Cargo.toml --example handle_crash

deny-check:
name: cargo-deny
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true
- uses: EmbarkStudios/cargo-deny-action@v1
with:
command-arguments: "-D warnings"

publish-check:
name: Publish Check
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- run: cargo fetch
- name: cargo publish check breakpad-sys
run: cargo publish --dry-run --manifest-path breakpad-sys/Cargo.toml
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

<!-- next-header -->
## [Unreleased] - ReleaseDate
### Changed
- [PR#22](https://github.com/EmbarkStudios/sentry-contrib-rust/pull/22) bumped `sentry-core` to `>=0.29` which will hopefully mean we don't need to bump version numbers for new releases until there is an actual breaking change.

## [0.6.0] - 2022-11-04
### Changed
- [PR#18](https://github.com/EmbarkStudios/sentry-contrib-rust/pull/18) bumped `sentry-core` to `0.28`.
Expand Down
6 changes: 3 additions & 3 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [email protected]. All
reported by contacting the project team at <[email protected]>. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Expand All @@ -68,9 +68,9 @@ members of the project's leadership.
## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
available at <https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
<https://www.contributor-covenant.org/faq>
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ debug-logs = []

[dependencies]
breakpad-handler = { version = "0.1.0", path = "./breakpad-handler" }
sentry-core = { version = "0.28", features = ["client"] }
sentry-core = { version = ">=0.29", features = ["client"] }
serde_json = "1.0"

[workspace]
Expand Down
12 changes: 3 additions & 9 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ vulnerability = "deny"
unmaintained = "deny"
yanked = "deny"
notice = "deny"
ignore = [
# time
"RUSTSEC-2020-0071",
]
ignore = []

[licenses]
allow = ["MIT", "Apache-2.0", "BSD-3-Clause", "Unicode-DFS-2016"]
Expand All @@ -20,15 +17,12 @@ exceptions = []
multiple-versions = "deny"
wildcards = "deny"
skip = []
skip-tree = [
# sentry-types depends on both time 0.3 and chrono -> time 0.1
{ name = "time", version = "=0.1.44" },
]
skip-tree = []

[sources]
unknown-registry = "deny"
unknown-git = "deny"
allow-git = []

[sources.allow-org]
github = ["EmbarkStudios"]
github = []
2 changes: 1 addition & 1 deletion src/transport.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ impl BreakpadTransport {
let serialized = md.serialize();

minidump_path.set_extension("metadata");
if let Err(e) = std::fs::write(&minidump_path, &serialized) {
if let Err(e) = std::fs::write(&minidump_path, serialized) {
debug_print!(
"failed to write crash metadata {}: {}",
minidump_path.display(),
Expand Down

0 comments on commit a404bc6

Please sign in to comment.