Compare commits

..

15 Commits

Author SHA1 Message Date
Thomas Schönauer
3dc245245d bugfix Closing #150 (#151) (#152)
Closes #150 please disable distrobox by default (#151)

* Check if distrobox exists before running step
2022-11-05 10:50:55 +00:00
Thomas Schönauer
9de111aa0f Merge of bug-fixes with masters the second (#149) 2022-11-05 09:17:51 +00:00
Thomas Schönauer
18951c8447 Merge branch 'master' into bug-fixes 2022-11-05 09:17:28 +00:00
Thomas Schönauer
b6e50a38af Revert "Bug fixes" (#148)
Revert "Bug fixes (#145)"

This reverts commit 8acdfc8d1c.
2022-11-05 09:15:52 +00:00
Rebecca Turner
8acdfc8d1c Bug fixes (#145) 2022-11-05 09:11:31 +00:00
Dylan M. Taylor
a6da5181f2 Fix for gcloud snap issue (#144) 2022-11-04 13:48:05 +00:00
0xMRTT
60ff087048 feat: add coc (#140) 2022-11-04 12:08:23 +00:00
Thomas Schönauer
3ebaac3a1d Fix windows clippy errors (#135)
* Changes windows get_wsl_distribution argument

* changes in get_wsl_distributions

* changes in run_wsl_topgrade due to clippy errors

* Resolves needless borrow
2022-11-03 21:43:45 +00:00
Thomas Schönauer
e4f8488837 Revert "Get windows to finish clippy without errors" (#134)
Revert "Get windows to finish clippy without errors (#133)"

This reverts commit 16953409fd.
2022-11-03 19:49:01 +00:00
Thomas Schönauer
d8748b004b Update check-and-lint.yaml 2022-11-03 19:40:24 +00:00
Thomas Schönauer
2a11df40ee Update check-and-lint.yaml 2022-11-03 19:40:02 +00:00
Thomas Schönauer
16953409fd Get windows to finish clippy without errors (#133)
* Changes windows get_wsl_distribution argument

* changes in get_wsl_distributions

* changes in run_wsl_topgrade due to clippy errors
2022-11-03 19:34:27 +00:00
Thomas Schönauer
c85adb8980 Update check-and-lint.yaml 2022-11-03 19:19:00 +00:00
Thomas Schönauer
0f0cbc1453 Update check-and-lint.yaml 2022-11-03 19:18:45 +00:00
Thomas Schönauer
91554cac56 GitHub action cleanup2 (#132)
* Changed clippy args for PR pipeline

* changes crates-publish toolchain version to stable

* Enhanced clippy for PRs

* Fixes typo
2022-11-03 19:09:44 +00:00
5 changed files with 150 additions and 13 deletions

View File

@@ -10,6 +10,7 @@ name: Check and Lint
jobs: jobs:
check: check:
name: Check name: Check
strategy:
matrix: matrix:
platform: [ ubuntu-latest, macos-latest, windows-latest ] platform: [ ubuntu-latest, macos-latest, windows-latest ]
runs-on: ${{ matrix.platform }} runs-on: ${{ matrix.platform }}
@@ -26,6 +27,7 @@ jobs:
fmt: fmt:
name: Rustfmt name: Rustfmt
strategy:
matrix: matrix:
platform: [ ubuntu-latest, macos-latest, windows-latest ] platform: [ ubuntu-latest, macos-latest, windows-latest ]
runs-on: ${{ matrix.platform }} runs-on: ${{ matrix.platform }}
@@ -44,6 +46,7 @@ jobs:
clippy: clippy:
name: Clippy name: Clippy
strategy:
matrix: matrix:
platform: [ ubuntu-latest, macos-latest, windows-latest ] platform: [ ubuntu-latest, macos-latest, windows-latest ]
runs-on: ${{ matrix.platform }} runs-on: ${{ matrix.platform }}
@@ -54,13 +57,13 @@ jobs:
toolchain: stable toolchain: stable
components: clippy components: clippy
override: true override: true
- uses: actions-rs/clippy-check@v1 - uses: actions-rs/cargo@v1.0.1
with: with:
token: ${{ secrets.GITHUB_TOKEN }} command: clippy
args: --all-targets --locked -- -D warnings args: --all-targets --locked -- -D warnings
name: Clippy Output name: Clippy Output
- uses: actions-rs/clippy-check@v1 - uses: actions-rs/cargo@v1.0.1
with: with:
token: ${{ secrets.GITHUB_TOKEN }} command: clippy
args: --all-targets --locked --all-features -- -D warnings args: --all-targets --locked --all-features -- -D warnings
name: Clippy (All features) Output name: Clippy (All features) Output

128
CODE_OF_CONDUCT.md Normal file
View File

@@ -0,0 +1,128 @@
# Contributor Covenant Code of Conduct
## Our Pledge
We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, religion, or sexual identity
and orientation.
We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.
## Our Standards
Examples of behavior that contributes to a positive environment for our
community include:
* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
overall community
Examples of unacceptable behavior include:
* The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
## Enforcement Responsibilities
Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.
Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.
## Scope
This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official e-mail address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.
## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
open an issue on GitHub .
All complaints will be reviewed and investigated promptly and fairly.
All community leaders are obligated to respect the privacy and security of the
reporter of any incident.
## Enforcement Guidelines
Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:
### 1. Correction
**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.
**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.
### 2. Warning
**Community Impact**: A violation through a single incident or series
of actions.
**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or
permanent ban.
### 3. Temporary Ban
**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.
**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.
### 4. Permanent Ban
**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.
**Consequence**: A permanent ban from any sort of public interaction within
the community.
## Attribution
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.0, available at
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
Community Impact Guidelines were inspired by [Mozilla's code of conduct
enforcement ladder](https://github.com/mozilla/diversity).
[homepage]: https://www.contributor-covenant.org
For answers to common questions about this code of conduct, see the FAQ at
https://www.contributor-covenant.org/faq. Translations are available at
https://www.contributor-covenant.org/translations.

View File

@@ -196,12 +196,16 @@ pub fn run_krew_upgrade(run_type: RunType) -> Result<()> {
pub fn run_gcloud_components_update(run_type: RunType) -> Result<()> { pub fn run_gcloud_components_update(run_type: RunType) -> Result<()> {
let gcloud = utils::require("gcloud")?; let gcloud = utils::require("gcloud")?;
print_separator("gcloud"); if gcloud.starts_with("/snap") {
Ok(())
} else {
print_separator("gcloud");
run_type run_type
.execute(gcloud) .execute(gcloud)
.args(["components", "update", "--quiet"]) .args(["components", "update", "--quiet"])
.check_run() .check_run()
}
} }
pub fn run_jetpack(run_type: RunType) -> Result<()> { pub fn run_jetpack(run_type: RunType) -> Result<()> {

View File

@@ -607,10 +607,12 @@ pub fn run_protonup_update(ctx: &ExecutionContext) -> Result<()> {
} }
pub fn run_distrobox_update(ctx: &ExecutionContext) -> Result<()> { pub fn run_distrobox_update(ctx: &ExecutionContext) -> Result<()> {
let distrobox = require("distrobox")?;
print_separator("Distrobox"); print_separator("Distrobox");
match ( match (
match ( match (
ctx.run_type().execute("distrobox").arg("upgrade"), ctx.run_type().execute(distrobox).arg("upgrade"),
ctx.config().distrobox_containers(), ctx.config().distrobox_containers(),
) { ) {
(r, Some(c)) => { (r, Some(c)) => {

View File

@@ -65,7 +65,7 @@ pub fn run_scoop(cleanup: bool, run_type: RunType) -> Result<()> {
Ok(()) Ok(())
} }
fn get_wsl_distributions(wsl: Path) -> Result<Vec<String>> { fn get_wsl_distributions(wsl: &Path) -> Result<Vec<String>> {
let output = Command::new(wsl).args(["--list", "-q"]).check_output()?; let output = Command::new(wsl).args(["--list", "-q"]).check_output()?;
Ok(output Ok(output
.lines() .lines()
@@ -80,7 +80,7 @@ fn upgrade_wsl_distribution(wsl: &Path, dist: &str, ctx: &ExecutionContext) -> R
.check_output() .check_output()
.map_err(|_| SkipStep(String::from("Could not find Topgrade installed in WSL")))?; .map_err(|_| SkipStep(String::from("Could not find Topgrade installed in WSL")))?;
let mut command = ctx.run_type().execute(&wsl); let mut command = ctx.run_type().execute(wsl);
command command
.args(["-d", dist, "bash", "-c"]) .args(["-d", dist, "bash", "-c"])
.arg(format!("TOPGRADE_PREFIX={} exec {}", dist, topgrade)); .arg(format!("TOPGRADE_PREFIX={} exec {}", dist, topgrade));
@@ -94,7 +94,7 @@ fn upgrade_wsl_distribution(wsl: &Path, dist: &str, ctx: &ExecutionContext) -> R
pub fn run_wsl_topgrade(ctx: &ExecutionContext) -> Result<()> { pub fn run_wsl_topgrade(ctx: &ExecutionContext) -> Result<()> {
let wsl = require("wsl")?; let wsl = require("wsl")?;
let wsl_distributions = get_wsl_distributions(wsl)?; let wsl_distributions = get_wsl_distributions(&wsl)?;
let mut ran = false; let mut ran = false;
debug!("WSL distributions: {:?}", wsl_distributions); debug!("WSL distributions: {:?}", wsl_distributions);