Skip to content

Commit 3d824b8

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/anaconda_black_GHSA-fj7x-q9j7-g6q6' into anaconda_black_GHSA-fj7x-q9j7-g6q6
2 parents 5121f6e + f1addfb commit 3d824b8

File tree

106 files changed

+14127
-1180
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+14127
-1180
lines changed

.github/actions/smoke-test/check-image-size.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/bin/bash
2+
3+
set -e
4+
25
# Function to handle errors
36
handle_error() {
47
local exit_code=$?
@@ -8,7 +11,6 @@ handle_error() {
811
exit $exit_code
912
}
1013
trap 'handle_error $LINENO ${BASH_COMMAND%% *}' ERR
11-
echo "This is line $LINENO"
1214

1315
convert_gb_to_bytes() {
1416
local gb="$1"
@@ -52,6 +54,7 @@ check_image_size() {
5254
if [ -n $image_size ] && [ $image_size -gt $threshold ]; then
5355
echo -e "\nImage size exceeds the threshold of $THRESHOLD_IN_GB gb"
5456
echo -e "\n❌ Image size check failed."
57+
exit 1;
5558
else
5659
echo -e "\n✅ Passed!"
5760
fi

.github/workflows/smoke-universal.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ jobs:
2626
uses: ./.github/actions/smoke-test
2727
with:
2828
image: universal
29-
threshold: 14
29+
threshold: 10

.github/workflows/version-history.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
102102
branch=automated-update-for-image-history-$GITHUB_RUN_ID
103103
git checkout -b $branch
104-
message='Automated update for image history [skip ci]'
104+
message='Automated update for image history'
105105
106106
# Add / update and commit
107107
git add -A

0 commit comments

Comments
 (0)