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

Misc updates #240

Merged
merged 3 commits into from
Dec 17, 2024
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
2 changes: 2 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ jobs:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
run:
snyk code test
--attachments=.snyk
--sarif
--sarif-file-output="${SARIF_FILENAME}"
--policy-path=.snyk
Expand Down Expand Up @@ -353,6 +354,7 @@ jobs:
KOSLI_FINGERPRINT: ${{ needs.build-image.outputs.fingerprint }}
run:
kosli attest snyk
--attachments=.snyk
--name=dashboard.snyk-container-scan
--scan-results="${SARIF_FILENAME}"

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cyberdojo/sinatra-base:16c1478
FROM cyberdojo/sinatra-base:db948c1
LABEL [email protected]

WORKDIR /dashboard
Expand Down
8 changes: 4 additions & 4 deletions bin/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@ clean_top_5()
{
# 1st 5 lines on Puma
local -r L1="Puma starting in single mode..."
local -r L2='* Puma version: 6.4.3 (ruby 3.3.6-p108) ("The Eagle of Durango")'
local -r L3="* Min threads: 0"
local -r L4="* Max threads: 5"
local -r L5="* Environment: production"
local -r L2='* Puma version: 6.5.0 ("Sky'"'"'s Version")'
local -r L3='* Ruby version: ruby 3.3.6 (2024-11-05 revision 75015d4c1f) [x86_64-linux-musl]'
local -r L4="* Min threads: 0"
local -r L5="* Max threads: 5"
#
local -r all5="$(printf "%s\n%s\n%s\n%s\n%s" "${L1}" "${L2}" "${L3}" "${L4}" "${L5}")"
echo "${all5}"
Expand Down
2 changes: 1 addition & 1 deletion source/client/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cyberdojo/sinatra-base:16c1478
FROM cyberdojo/sinatra-base:db948c1
LABEL [email protected]

WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion test/slim_json_reporter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def report
super
filename = "#{ENV.fetch('COVERAGE_ROOT')}/test_metrics.json"
metrics = {
total_time: format('%.2f', total_time),
total_time: total_time.round(2),
assertion_count: assertions,
test_count: count,
failure_count: failures,
Expand Down
Loading