Skip to content

Commit

Permalink
Merge branch 'main' into fix/only-aditional-info-should-support-legac…
Browse files Browse the repository at this point in the history
…y-html
  • Loading branch information
oskogstad authored Oct 1, 2024
2 parents 7c0ea3b + dbb79dc commit cd3cc8c
Show file tree
Hide file tree
Showing 25 changed files with 340 additions and 294 deletions.
14 changes: 10 additions & 4 deletions .github/tools/revisionVerifier.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
if ! command -v jq 2>&1 >/dev/null
then
echo "jq could not be found, attempting to install from tdnf ..."
tdnf install -y jq
fi

if [ -z "$1" ]; then
echo "Usage: $0 <revision-name>"
exit 1
Expand All @@ -14,10 +20,10 @@ query_filter="{name:name, runningState:properties.runningState, healthState:prop

verify_revision() {
local json_output

# Fetch app revision
json_output=$(az containerapp revision show -g "$resource_group" --revision "$revision_name" --query "$query_filter" 2>/dev/null)

health_state=$(echo $json_output | jq -r '.healthState')
running_state=$(echo $json_output | jq -r '.runningState')

Expand All @@ -26,7 +32,7 @@ verify_revision() {
echo "Health state: $health_state"
echo "Running state: $running_state"
echo " "

# Check health and running status
if [[ $health_state == "Healthy" && ($running_state == "Running" || $running_state == "RunningAtMaxScale") ]]; then
return 0 # OK!
Expand All @@ -47,4 +53,4 @@ while true; do
sleep 10 # Sleep for 10 seconds
attempt=$((attempt+1))
fi
done
done
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [1.20.0](https://github.com/digdir/dialogporten/compare/v1.19.0...v1.20.0) (2024-09-30)


### Features

* **GraphQL:** Add DialogToken requirement for subscriptions ([#1124](https://github.com/digdir/dialogporten/issues/1124)) ([651ca62](https://github.com/digdir/dialogporten/commit/651ca62fdec02dec48b674b80acf52737036cf13))

## [1.19.0](https://github.com/digdir/dialogporten/compare/v1.18.1...v1.19.0) (2024-09-24)


Expand Down
Loading

0 comments on commit cd3cc8c

Please sign in to comment.