Merge pull request #5598 from rjbou/gha

gha: fix master cli version check
ocaml · Jul 12, 2023 · 9173bee · 9173bee
2 parents 2c097c9 + 45cc372
commit 9173bee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/scripts/main/hygiene.sh b/.github/scripts/main/hygiene.sh
@@ -97,7 +97,7 @@ cd ..
 
 if [ "$GITHUB_EVENT_NAME" = "push" ] && [ "$BRANCH" = "master" ]; then
   (set +x ; echo -en "::group::check default cli\r") 2>/dev/null
-  CURRENT_MAJOR="`sed -n "s/^AC_INIT(opam,\([0-9]\+\)[^0-9]*.*)$/\1/p" configure.ac`"
+  CURRENT_MAJOR="`sed -n "s/^AC_INIT(\[opam],\[\([0-9]\+\)[^0-9]*.*])$/\1/p" configure.ac`"
   DEFAULT_CLI_MAJOR="`sed -n "/let *default *=/s/.*(\([0-9]*\)[^0-9]*.*/\1/p" src/client/opamCLIVersion.ml`"
   if [ $CURRENT_MAJOR -eq $DEFAULT_CLI_MAJOR ]; then
     echo "Major viersion is default cli one: $CURRENT_MAJOR"

diff --git a/master_changes.md b/master_changes.md
@@ -103,6 +103,7 @@ users)
 ## Github Actions
   * Fix hygiene scripts for install check: it was missing a conversion `~` -> `-` for dev version [#5588 @rjbou]
   * Add configure autoupdate test [#5555 @rjbou]
+  * Fix cli version master check, introduced by #5555 [#5598 @rjbou]
 
 ## Doc