update

ocaml · Jul 17, 2024 · 1a47e83 · 1a47e83
1 parent 4ae8e8e
commit 1a47e83
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/.github/scripts/depexts/generate-actions.sh b/.github/scripts/depexts/generate-actions.sh
@@ -106,6 +106,7 @@ EOF
     cat >$dir/Dockerfile << EOF
 FROM nixos/nix
 RUN nix-channel --update
+RUN nix-shell -p gnum4 git rsync patch gnutar bzip2 gnumake wget ocamlPackages.ocaml ocamlPackages.ocaml-compiler-libs unzip
 EOF
 esac
 
@@ -137,7 +138,7 @@ ENTRYPOINT ["/opam/entrypoint.sh"]
 EOF
 else
   cat >>$dir/Dockerfile << EOF
-ENTRYPOINT ["nix-shell", "-p", "gnum4", "git", "rsync", "patch", "gnutar", "bzip2", "gnumake", "wget", "ocamlPackages.ocaml", "ocamlPackages.ocaml-compiler-libs", "opam", "--run", "/opam/entrypoint.sh"]
+ENTRYPOINT ["nix-shell", "-p", "gnum4", "git", "rsync", "patch", "gnutar", "bzip2", "gnumake", "wget", "ocamlPackages.ocaml", "ocamlPackages.ocaml-compiler-libs", "unzip", "--run", "/opam/entrypoint.sh"]
 EOF
 fi
 
@@ -146,6 +147,18 @@ cat >$dir/entrypoint.sh << EOF
 #!/bin/sh
 set -eux
 
+EOF
+
+if [ "$target" != "nix" ]; then
+  cat >>$dir/entrypoint.sh << EOF
+export PATH="$PATH:/usr/bin/"
+chmod +x /usr/bin/opam
+
+EOF
+fi
+
+### Generate the entrypoint
+cat >$dir/entrypoint.sh << EOF
 git config --global --add safe.directory /github/workspace
 
 # Workdir is /github/workpaces