From e1be51ff98d905cfbd6d2d85c3ac37a3f16284f5 Mon Sep 17 00:00:00 2001
From: Allan Blanchard <allan.blanchard@cea.fr>
Date: Mon, 6 Mar 2023 09:42:51 +0100
Subject: [PATCH] [ci] use jq for the release json
---
dev/build-release.sh | 2 +-
nix/frama-c-checkers-shell.nix | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/dev/build-release.sh b/dev/build-release.sh
index 86269c81054..7aad889e2cb 100755
--- a/dev/build-release.sh
+++ b/dev/build-release.sh
@@ -356,7 +356,7 @@ cat >$JSON_DATA <<EOL
]
},
EOL
-echo " \"description\": \"# Main changes since $PREVIOUS $PREVIOUS_NAME\n$(cat "$CHANGES" | sed -z 's/\\/\\\\/g' | sed -z 's/\n/\\n/g' | sed -z 's/\(\#.*\)/#\1/')\"" >> $JSON_DATA
+echo " \"description\": \"# Main changes since $PREVIOUS $PREVIOUS_NAME\n$(jq <"$CHANGES" --raw-input 'sub("^#";"##")' | jq --slurp 'join("\n")' | sed 's/^.//;s/.$//')" >> $JSON_DATA
echo "}" >> $JSON_DATA
echo "Release data file built"
diff --git a/nix/frama-c-checkers-shell.nix b/nix/frama-c-checkers-shell.nix
index c552a3c4e64..6bd68e73379 100644
--- a/nix/frama-c-checkers-shell.nix
+++ b/nix/frama-c-checkers-shell.nix
@@ -8,6 +8,7 @@
, git-lfs
, gnumake
, headache
+, jq
, ocp-indent
} :
stdenv.mkDerivation rec {
@@ -21,6 +22,7 @@ stdenv.mkDerivation rec {
git-lfs
gnumake
headache
+ jq
ocp-indent
];
}
--
GitLab