Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev/sol/agent plugin #392

Merged
merged 6 commits into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ jobs:
step: cargo-clippy
- name: Rust tests
step: cargo-test
- name: Powershell static analysis
step: PSScriptAnalyzer-check-all

steps:
- name: Checkout repository
Expand Down Expand Up @@ -52,12 +50,6 @@ jobs:
with:
components: rustfmt, clippy

- name: ${{ matrix.name }}
env:
STEP: ${{ matrix.step }}
run: .\ci.ps1 $env:STEP
shell: powershell

check_success:
if: always()

Expand Down
3 changes: 0 additions & 3 deletions PSScriptAnalyzerSettings.psd1

This file was deleted.

74 changes: 0 additions & 74 deletions checkmk_extensions/agent/robotmk_collector.ps1

This file was deleted.

171 changes: 0 additions & 171 deletions checkmk_extensions/agent/scheduler_runner.ps1

This file was deleted.

22 changes: 0 additions & 22 deletions ci
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ main() {
topdir="$(git rev-parse --show-toplevel)"
self="${topdir}/ci"
cargo_toml_path="${topdir}/v2/robotmk/Cargo.toml"
checkmk_extensions_dir="${topdir}/checkmk_extensions"
mode="${1}"
shift

Expand All @@ -21,34 +20,13 @@ main() {
cargo test --manifest-path "${cargo_toml_path}" --all-targets
;;

'PSScriptAnalyzer-check-all')
pwsh_output=$(pwsh -Command "Invoke-ScriptAnalyzer -Settings ${topdir}/PSScriptAnalyzerSettings.psd1 -Path ${checkmk_extensions_dir} -Recurse")
pwsh_exitcode="$?"
if [ "${pwsh_exitcode}" -eq 0 ]; then {
if [ -z "${pwsh_output}" ]; then {
echo "No static Powershell issues found"
return 0
} else {
echo "${pwsh_output}"
return 1
}
fi
} else {
echo "${pwsh_output}"
return "${pwsh_exitcode}"
}
fi
;;

'check-all')
exit_code=0
for rust_step in fmt-check clippy test
do
"${self}" "cargo-${rust_step}"
exit_code=$(( exit_code + $? ))
done
"${self}" "PSScriptAnalyzer-check-all"
return "$(( exit_code + $? ))"
;;

*)
Expand Down
1 change: 0 additions & 1 deletion v2/data/retry_rcc/windows.ps1

This file was deleted.

1 change: 0 additions & 1 deletion v2/data/retry_suite/windows.ps1

This file was deleted.

30 changes: 30 additions & 0 deletions v2/robotmk/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions v2/robotmk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ log = "*"
serde = { version = "1.0.188", features = ["derive"] }
serde_json = "*"
sysinfo = "*"
tempfile = "3.8.0"
walkdir = "2.4.0"
Loading
Loading