gha: depexts, remove opensuse workaround for glpk/mccs

ocaml · Jul 9, 2024 · f3bc570 · f3bc570
1 parent fc3b139
commit f3bc570
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/.github/scripts/depexts/generate-actions.sh b/.github/scripts/depexts/generate-actions.sh
@@ -142,17 +142,6 @@ cd /github/workspace
 #git clone https://github.com/ocaml/opam --single-branch --branch 2.2 --depth 1 local-opam
 #cd local-opam
 
-EOF
-
-# workaround for opensuse, mccs & glpk
-if [ $target = "opensuse" ]; then
-  cat >>$dir/entrypoint.sh << EOF
-OPAMEDITOR="sed -i 's|^build.*$|& [\\"mv\\" \\"src/glpk/dune-shared\\" \\"src/glpk/dune\\"]|'" opam pin edit mccs -yn
-#opam show --raw mccs
-EOF
-fi
-
-cat >>$dir/entrypoint.sh << EOF
 opam install . --deps
 eval \$(opam env)
 ./configure

diff --git a/master_changes.md b/master_changes.md
@@ -129,6 +129,7 @@ users)
   * Depexts: move parts to docker build image, for caching [#6079 @rjbou]
   * Depexts: set version for conf packages to check [#6079 @rjbou]
   * Depexts: add package to test containing `os-version` in filter [#6079 @rjbou]
+  * Depexts: fix opensuse job [#6079 @rjbou]
 
 ## Doc
   * Remove the ppa from the installation instructions on Ubuntu [#5988 @kit-ty-kate - fix #5987]