Skip to content

Commit

Permalink
Merge downstream changes into upstream main (#8)
Browse files Browse the repository at this point in the history
* Add screen view module
* Implement screen view functionality
* Implement loggin functionality
* Expose default logging implementation in an optional feature
* Add isotoenv library to repository
* Fix Labeler workflow
* Add IDE configs to .gitignore
* Remove copy-paste error from contributing guide
  • Loading branch information
ByteOtter authored Aug 14, 2024
2 parents dde6b39 + 6241069 commit be3cde4
Show file tree
Hide file tree
Showing 29 changed files with 1,164 additions and 65 deletions.
26 changes: 26 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
root = true

[*]
indent_style = space
indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true

[*.rs]
charset = utf-8
max_line_length = 120

[*.toml]
indent_style = space
indent_size = 2

[*.yml]
indent_style = space
indent_size = 2

[*.md]
trim_trailing_whitespace = false

[*.sh]
indent_style = space
indent_size = 4
20 changes: 15 additions & 5 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
rust:
- **/**/*.rs

dependencies:
- Cargo.toml
- **/Cargo.toml
- **/Cargo.lock
- isototest/Cargo.toml
- isototest/Cargo.lock
- isotoenv/Cargo.toml
- isotoenv/Cargo.lock
- isotomachine/Cargo.toml
- isotomachine/Cargo.lock
- Cargo.lock

isototest:
- isototest/*

isotomachine:
- isotomachine/*

isotoenv:
- isotoenv/*

documentation:
- docs/**
- README.md
Expand Down
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@ Cargo.lock
# MSVC Windows builds of rustc generate these, which store debugging information
*.pdb


# Added by cargo

/target

# Local test binary
vnc-test/

# Editor Configs
.idea/
.vscode/
.lvim-config.lua
11 changes: 0 additions & 11 deletions docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,3 @@ Code without tests might be rejected or take longer to process.
If you discover a security vulnerability in our code, please inform us privately immediately according to our [Security Policy](./SECURITY.md).

If you wish to fix a vulnerability, please also inform us and stand by for our green light. We would still like to investigate the vulnerability for ourselves to get an overview over the severity and scope of the problem. *Please refrain from publishing a fix until we came back to you or have published a security advisory*.

## Disclaimer

By contributing to this project you agree to surrender your contribution to the Nazara Project.

Your contribution to this project will be subject to the same licensing terms as the rest of the project.

This is a standard practice in open-source projects to ensure that all contributions are compatible with the project's overall license and to maintain consistency in the project's legal framework.

It's important for contributors to be aware of this agreement to ensure that their contributions are properly integrated into the project without any legal conflicts.
#### Thank you for your contribution!
7 changes: 1 addition & 6 deletions docs/SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Reporting a Vulnerability

If you discover a security vulnerability in this project, please report it by emailing the
[project owner](mailto:christopher-hock@protonmail.com). Please provide detailed information about the vulnerability,
[project owner](mailto:christopher-hock@suse.com). Please provide detailed information about the vulnerability,
including steps to reproduce, possible ways of exploitation and any relevant details about your environment.

We appreciate responsible disclosure.
Expand All @@ -22,8 +22,3 @@ dependencies which you may be planning to introduce to the project beforehand to

This security policy is subject to change. It is the responsibility of all project contributors and users to stay
updated on any modifications. By participating in this project, you agree to abide by this security policy.

Nazara is designed to run only within your local network. The user is responsible for their network setup
themselves.

We are not liable for any damages that are caused by insufficient network security.
21 changes: 21 additions & 0 deletions isotoenv/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Generated by Cargo
# will have compiled files and executables
debug/
target/

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Cargo.lock

# These are backup files generated by rustfmt
**/*.rs.bk

# MSVC Windows builds of rustc generate these, which store debugging information
*.pdb

# Added by cargo
/target

# Editor Configs
.idea/
.vscode/
18 changes: 18 additions & 0 deletions isotoenv/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[package]
name = "isotoenv"
version = "0.1.0"
edition = "2021"
description = "A library for creating an openQA test environment on a designated target"
readme = "README.md"
repository = "https://github.com/os-autoinst/isotest-ng/tree/main/isotoenv"
license = "GPL-2.0"

[dependencies]
log = "0.4.22"
env_logger = { version = "0.11.5", optional = true }

[dev-dependencies]

[features]
# Feature to enable default logging configuration
default-logging = ["env_logger"]
Loading

0 comments on commit be3cde4

Please sign in to comment.