Merge pull request #5410 from rjbou/gha

GHA: fix gentoo depext job
ocaml · Jan 7, 2023 · 5f6086f · 5f6086f
2 parents c3bbb7a + 0e42926
commit 5f6086f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.github/scripts/depexts/generate-actions.sh b/.github/scripts/depexts/generate-actions.sh
@@ -61,6 +61,7 @@ EOF
   gentoo)
   mainlibs=${mainlibs/git/dev-vcs\/git}
   mainlibs=${mainlibs/tar/app-arch\/tar}
+  mainlibs=${mainlibs/bzip2/app-arch\/bzip2}
   cat >$dir/Dockerfile << EOF
 # name the portage image
 FROM gentoo/portage as portage

diff --git a/master_changes.md b/master_changes.md
@@ -427,6 +427,7 @@ users)
   * Run ci on tests changes [#4966 @rjbou]
   * GHA: Fix caching for the "test" job [#5090 @dra27 @kit-ty-kate]
   * Add gentoo depext test [#5067 @rjbou]
+    * specify app-arch for bzip2 [#5410 @rjbou]
   * Add more constraint path for launch of workflow [#5067 @rjbou]
   * Upgrade packages for sovler jobs, in case depext changed [#5010 @rjbou]
   * Fix github safe directory issues in depext workflow [#5153 @rjbou]