Skip to content

Conversation

@MisterDA
Copy link
Contributor

@MisterDA MisterDA commented Feb 3, 2023

Currently testing this.
I'm only building opam master, using mingw-w64 (64 bits). Two aliases are available, opam-dev and opam-2.2.

@MisterDA MisterDA force-pushed the windows-opam-source branch 2 times, most recently from da0be58 to 2d47233 Compare February 3, 2023 18:14
@MisterDA MisterDA force-pushed the windows-opam-source branch 3 times, most recently from 078ffcc to a40faba Compare February 9, 2023 10:47
Copy link
Contributor

@kit-ty-kate kit-ty-kate left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like the HEAD commit of your master branch has been merged upstream so this shouldn’t be necessary anymore

@MisterDA MisterDA force-pushed the windows-opam-source branch from a40faba to 639a680 Compare February 9, 2023 12:10
@MisterDA MisterDA force-pushed the windows-opam-source branch from 639a680 to ece0303 Compare February 9, 2023 12:41
@MisterDA MisterDA marked this pull request as ready for review February 9, 2023 12:42
@MisterDA MisterDA requested a review from kit-ty-kate February 9, 2023 12:45
(if enable_0install_solver then " --with-0install-solver" else ""))
@@ Windows.Cygwin.run_sh ?cyg
"cd /tmp/opam-build-%s && mkdir -p %s/bin && cp /tmp/opam-build-%s/opam \
%s/bin/opam-%s && chmod a+x %s/bin/opam-%s"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried removing the build directory, but rm complained about an non-empty dir. Presumably, some file inside of it couldn't be removed (permission issue?). That's not too bad since I'm using a separate build stage.

@MisterDA MisterDA merged commit 083a9aa into master Feb 9, 2023
@MisterDA MisterDA deleted the windows-opam-source branch February 9, 2023 12:57
MisterDA added a commit to ocurrent/docker-base-images that referenced this pull request Feb 9, 2023
- ocaml-dockerfile
  + Build and install opam master from source in Windows images.
    (@MisterDA ocurrent/ocaml-dockerfile#140)
  + Include the ocaml-beta-repository in the images.
    (@kit-ty-kate ocurrent/ocaml-dockerfile#132, review by @MisterDA)

- ocluster
  + Custom healthcheck period. (@mtelvers ocurrent/ocluster#214)
MisterDA added a commit to ocurrent/docker-base-images that referenced this pull request Feb 10, 2023
- ocaml-dockerfile
  + Build and install opam master from source in Windows images.
    (@MisterDA ocurrent/ocaml-dockerfile#140)
  + Include the ocaml-beta-repository in the images.
    (@kit-ty-kate ocurrent/ocaml-dockerfile#132, review by @MisterDA)

- ocluster
  + Custom healthcheck period. (@mtelvers ocurrent/ocluster#214)
  + Allow workers to report additional prometheus metrics. (@patricoferris ocurrent/ocluster#210)
  + other minor things.
MisterDA added a commit to ocurrent/docker-base-images that referenced this pull request Feb 10, 2023
- ocaml-dockerfile
  + Build and install opam master from source in Windows images.
    (@MisterDA ocurrent/ocaml-dockerfile#140)
  + Include the ocaml-beta-repository in the images.
    (@kit-ty-kate ocurrent/ocaml-dockerfile#132, review by @MisterDA)

- ocluster
  + Custom healthcheck period. (@mtelvers ocurrent/ocluster#214)
  + Allow workers to report additional prometheus metrics. (@patricoferris ocurrent/ocluster#210)
  + other minor things.

- ocaml-version
  + Expose 4.08.1 and 4.14.1 (@MisterDA ocurrent/ocaml-version#60)
MisterDA added a commit to ocurrent/docker-base-images that referenced this pull request Feb 13, 2023
- ocaml-dockerfile
  + Build and install opam master from source in Windows images.
    (@MisterDA ocurrent/ocaml-dockerfile#140 ocurrent/ocaml-dockerfile#142)
  + Include the ocaml-beta-repository in the images.
    (@kit-ty-kate ocurrent/ocaml-dockerfile#132, review by @MisterDA)

- ocluster
  + Custom healthcheck period. (@mtelvers ocurrent/ocluster#214)
  + Allow workers to report additional prometheus metrics. (@patricoferris ocurrent/ocluster#210)
  + other minor things.

- ocaml-version
  + Expose 4.08.1 and 4.14.1 (@MisterDA ocurrent/ocaml-version#60)

fixup
MisterDA added a commit to MisterDA/opam-repository that referenced this pull request Mar 23, 2023
CHANGES:

- Install system packages required by OCaml in the ocaml stage,
  starting with OCaml 5.1 and libzstd.
  (@MisterDA ocurrent/ocaml-dockerfile#149, review by @kit-ty-kate)
- Add OracleLinux 9. (@MisterDA ocurrent/ocaml-dockerfile#155)
- Optimize and fix Linux package install.
  (@MisterDA ocurrent/ocaml-dockerfile#147, ocurrent/ocaml-dockerfile#151, ocurrent/ocaml-dockerfile#153, ocurrent/ocaml-dockerfile#154, review by @kit-ty-kate)
- Switch to ocaml-opam/opam-repository-mingw#sunset for Windows images. (@MisterDA ocurrent/ocaml-dockerfile#152)
- Use DockerHub user risvc64/ubuntu. (@MisterDA, ocurrent/ocaml-dockerfile#150)
- Various LCU Updates (@mtelvers ocurrent/ocaml-dockerfile#144 ocurrent/ocaml-dockerfile#136 ocurrent/ocaml-dockerfile#135)
- Support mounts, networks, and security parameters in RUN
  commands, add buildkit_syntax helper function.
  (@MisterDA, @edwintorok, ocurrent/ocaml-dockerfile#137, ocurrent/ocaml-dockerfile#139, review by @edwintorok)
- Build and install opam master from source in Windows images.
  (@MisterDA ocurrent/ocaml-dockerfile#140, ocurrent/ocaml-dockerfile#142, ocurrent/ocaml-dockerfile#143)
- Include the ocaml-beta-repository in the images. (@kit-ty-kate ocurrent/ocaml-dockerfile#132, review by @MisterDA)
- Add OpenSUSE 15.4, deprecate OpenSUSE 15.3. (@MisterDA ocurrent/ocaml-dockerfile#138)
- Update to bubblewrap 0.8.0. (@MisterDA ocurrent/ocaml-dockerfile#131 ocurrent/ocaml-dockerfile#148)
- Add Alpine 3.17 (3.16 is now tier 2 and 3.15 is deprecated). Remove
  libexecinfo-dev from the list of apk packages as it is no longer
  available. Its symbols are only used in OCaml's self tests.
  (@MisterDA ocurrent/ocaml-dockerfile#129, ocurrent/ocaml-dockerfile#130)
- Fix location of Debian exotic architecture images (@dra27 ocurrent/ocaml-dockerfile#134)
- Fix passing of --platform to all stages of the Dockerfiles (@dra27 ocurrent/ocaml-dockerfile#134)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants