diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9d1b1ee817b..254a6ff4f84 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -143,7 +143,7 @@ jobs: sudo add-apt-repository ppa:avsm/ppa -y # provides OPAM 2 sudo add-apt-repository ppa:haxe/ocaml -y # provides newer version of mbedtls sudo apt-get update -qqy - sudo apt-get install -qqy ocaml-nox camlp5 opam libpcre2-dev zlib1g-dev libgtk2.0-dev libmbedtls-dev ninja-build libstring-shellquote-perl libipc-system-simple-perl + sudo apt-get install -qqy ocaml-nox opam libpcre2-dev zlib1g-dev libgtk2.0-dev libmbedtls-dev ninja-build - name: Install OCaml libraries if: steps.cache-opam.outputs.cache-hit != 'true' @@ -478,8 +478,6 @@ jobs: set -ex brew update brew bundle --file=tests/Brewfile --no-upgrade - cpanm IPC::System::Simple - cpanm String::ShellQuote curl -L https://github.com/madler/zlib/releases/download/v$ZLIB_VERSION/zlib-$ZLIB_VERSION.tar.gz | tar xz cd zlib-$ZLIB_VERSION ./configure diff --git a/Earthfile b/Earthfile index d1e64e54586..9595c123361 100644 --- a/Earthfile +++ b/Earthfile @@ -61,15 +61,12 @@ devcontainer: && add-apt-repository ppa:haxe/ocaml \ && apt-get install -qqy --no-install-recommends \ ocaml-nox \ - camlp5 \ opam \ libpcre2-dev \ zlib1g-dev \ libgtk2.0-dev \ libmbedtls-dev \ ninja-build \ - libstring-shellquote-perl \ - libipc-system-simple-perl \ # # Clean up && apt-get autoremove -y \ diff --git a/Makefile b/Makefile index e5909114cd7..aebe84c8695 100644 --- a/Makefile +++ b/Makefile @@ -142,7 +142,7 @@ uninstall: rm -rf $(DESTDIR)$(INSTALL_STD_DIR) opam_install: - opam install camlp5 ocamlfind dune --yes + opam install ocamlfind dune --yes haxe_deps: opam pin add haxe . --no-action diff --git a/extra/github-actions/build-mac.yml b/extra/github-actions/build-mac.yml index 9098e76fc6c..659f09d58e0 100644 --- a/extra/github-actions/build-mac.yml +++ b/extra/github-actions/build-mac.yml @@ -8,8 +8,6 @@ set -ex brew update brew bundle --file=tests/Brewfile --no-upgrade - cpanm IPC::System::Simple - cpanm String::ShellQuote curl -L https://github.com/madler/zlib/releases/download/v$ZLIB_VERSION/zlib-$ZLIB_VERSION.tar.gz | tar xz cd zlib-$ZLIB_VERSION ./configure diff --git a/extra/github-actions/workflows/main.yml b/extra/github-actions/workflows/main.yml index cd0495e46a2..cdd462437ca 100644 --- a/extra/github-actions/workflows/main.yml +++ b/extra/github-actions/workflows/main.yml @@ -52,7 +52,7 @@ jobs: sudo add-apt-repository ppa:avsm/ppa -y # provides OPAM 2 sudo add-apt-repository ppa:haxe/ocaml -y # provides newer version of mbedtls sudo apt-get update -qqy - sudo apt-get install -qqy ocaml-nox camlp5 opam libpcre2-dev zlib1g-dev libgtk2.0-dev libmbedtls-dev ninja-build libstring-shellquote-perl libipc-system-simple-perl + sudo apt-get install -qqy ocaml-nox opam libpcre2-dev zlib1g-dev libgtk2.0-dev libmbedtls-dev ninja-build - name: Install OCaml libraries if: steps.cache-opam.outputs.cache-hit != 'true' diff --git a/tests/Brewfile b/tests/Brewfile index ac7f3f61b01..7b0a1e40f15 100644 --- a/tests/Brewfile +++ b/tests/Brewfile @@ -3,4 +3,3 @@ brew "ninja" brew "cmake" brew "pkg-config" brew "libunistring" -brew "cpanminus" \ No newline at end of file