diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml index 5413a76..d423282 100644 --- a/.github/workflows/changelog.yaml +++ b/.github/workflows/changelog.yaml @@ -16,7 +16,7 @@ jobs: contents: write steps: - name: Harden Runner - uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2 + uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0 with: disable-sudo: true egress-policy: block diff --git a/.github/workflows/cross-build.yaml b/.github/workflows/cross-build.yaml index 77e957f..00443dc 100644 --- a/.github/workflows/cross-build.yaml +++ b/.github/workflows/cross-build.yaml @@ -33,7 +33,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2 + uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0 with: disable-sudo: true egress-policy: block @@ -110,7 +110,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2 + uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0 with: egress-policy: block allowed-endpoints: > @@ -158,7 +158,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2 + uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0 with: egress-policy: block allowed-endpoints: > diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 8f9d89c..d35343a 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2 + uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0 with: disable-sudo: true egress-policy: block diff --git a/.github/workflows/health.yaml b/.github/workflows/health.yaml index cb52990..9eca8d5 100644 --- a/.github/workflows/health.yaml +++ b/.github/workflows/health.yaml @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2 + uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0 with: disable-sudo: true egress-policy: block @@ -58,7 +58,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2 + uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0 with: disable-sudo: true egress-policy: block diff --git a/.github/workflows/licenses.yaml b/.github/workflows/licenses.yaml index e711b2a..be1abde 100644 --- a/.github/workflows/licenses.yaml +++ b/.github/workflows/licenses.yaml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2 + uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0 with: disable-sudo: true egress-policy: block diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index d81f93f..7344daa 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -26,7 +26,7 @@ jobs: RUSTC_WRAPPER: "sccache" steps: - name: Harden Runner - uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2 + uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0 with: disable-sudo: true egress-policy: block @@ -65,7 +65,7 @@ jobs: RUSTC_WRAPPER: "sccache" steps: - name: Harden Runner - uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2 + uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0 with: disable-sudo: true egress-policy: block diff --git a/.github/workflows/release-packaging.yaml b/.github/workflows/release-packaging.yaml index d94bbe3..902d880 100644 --- a/.github/workflows/release-packaging.yaml +++ b/.github/workflows/release-packaging.yaml @@ -17,7 +17,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2 + uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0 with: egress-policy: block allowed-endpoints: > diff --git a/.github/workflows/scorecard.yaml b/.github/workflows/scorecard.yaml index 8f935a3..2a63e5b 100644 --- a/.github/workflows/scorecard.yaml +++ b/.github/workflows/scorecard.yaml @@ -25,7 +25,7 @@ jobs: id-token: write steps: - name: Harden Runner - uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2 + uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0 with: disable-sudo: true egress-policy: block diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml index f912747..ee56115 100644 --- a/.github/workflows/security.yaml +++ b/.github/workflows/security.yaml @@ -64,7 +64,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2 + uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0 with: disable-sudo: true egress-policy: block diff --git a/.github/workflows/test-with-coverage.yaml b/.github/workflows/test-with-coverage.yaml index 64bf7f7..8b6a271 100644 --- a/.github/workflows/test-with-coverage.yaml +++ b/.github/workflows/test-with-coverage.yaml @@ -32,7 +32,7 @@ jobs: steps: - name: Harden Runner - uses: step-security/harden-runner@5ef0c079ce82195b2a36a210272d6b661572d83e # v2.14.2 + uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0 with: disable-sudo: true egress-policy: block diff --git a/backpack/cli/src/commands/merge/mod.rs b/backpack/cli/src/commands/merge/mod.rs index fb99719..abf2c66 100644 --- a/backpack/cli/src/commands/merge/mod.rs +++ b/backpack/cli/src/commands/merge/mod.rs @@ -5,11 +5,7 @@ use rootcause::prelude::*; use rootcause_backtrace::BacktraceCollector; use tracing::instrument; -use github_bot_lib::{ - cli::Args, - utils::get_repo, - github, -}; +use github_bot_lib::{cli::Args, github, utils::get_repo}; #[instrument(level = "debug", target = "errors::rootcause", name = "run")] pub fn run(target: Option) -> anyhow::Result<()> { diff --git a/backpack/cli/src/main.rs b/backpack/cli/src/main.rs index 9aa2c4c..219d1ed 100644 --- a/backpack/cli/src/main.rs +++ b/backpack/cli/src/main.rs @@ -157,7 +157,7 @@ async fn main() -> anyhow::Result<()> { .unwrap_or_default(), }, ) - .await; + .await; merge::run(target_repo)?; diff --git a/backpack/lib/src/utils/mod.rs b/backpack/lib/src/utils/mod.rs index a5e05f1..682cd57 100644 --- a/backpack/lib/src/utils/mod.rs +++ b/backpack/lib/src/utils/mod.rs @@ -1,5 +1,5 @@ +use anyhow::{Context, Result, bail}; use dialoguer::Input; -use anyhow::{bail, Result, Context}; use std::process::Command; /// Check if current directory is inside a git repo