Ocamlformat fixes (#16)

* Fix up some documentation around ocamlformat build script Signed-off-by: Stephen Sherratt <[email protected]> * Fix bug where ocamlformat was dynamically linked on linux We were still running the build script on ubuntu runners which produced the same artifact names as the dockerfile but which contained dynamic binaries. Signed-off-by: Stephen Sherratt <[email protected]> --------- Signed-off-by: Stephen Sherratt <[email protected]>
ocaml-dune · Nov 25, 2024 · 286e732 · 286e732
1 parent 46c289b
commit 286e732
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -100,10 +100,6 @@ jobs:
         os: [macos-14, macos-13]
         ocaml: ["5.2.1", "5.1.1"]
         include:
-          - os: ubuntu-latest
-            version: "0.26.2"
-            ocaml: "5.2.1"
-            target_triple: x86_64-unknown-linux-musl
           - os: macos-13
             version: "0.26.2"
             ocaml: "5.2.1"
@@ -112,10 +108,6 @@ jobs:
             version: "0.26.2"
             ocaml: "5.2.1"
             target_triple: aarch64-apple-darwin
-          - os: ubuntu-latest
-            version: "0.26.1"
-            ocaml: "5.1.1"
-            target_triple: x86_64-unknown-linux-musl
           - os: macos-13
             version: "0.26.1"
             ocaml: "5.1.1"

diff --git a/build-scripts/ocamlformat/Dockerfile b/build-scripts/ocamlformat/Dockerfile
@@ -25,7 +25,7 @@ WORKDIR $HOME
 
 RUN opam init --disable-sandboxing --auto-setup --bare
 
-# Build ocamllsp
+# Build ocamlformat
 RUN mkdir switch
 WORKDIR switch
 RUN opam switch create . "ocaml.$OCAML_VERSION"

diff --git a/build-scripts/ocamlformat/README.md b/build-scripts/ocamlformat/README.md
@@ -12,7 +12,7 @@ necessary).
 
 Example usage:
 ```
-$ docker buildx build . --target=export --output type=local,dest=$(pwd)/out/ --build-arg TAG=2024-11-21.0 --build-arg TARGET=x86_64-unknown-linux-musl --build-arg OCAML_VERSION=5.1.1 --build-arg OCAMLFORMAT_VERSION=1.18.0
+$ docker buildx build . --target=export --output type=local,dest=$(pwd)/out/ --build-arg TAG=2024-11-21.0 --build-arg TARGET=x86_64-unknown-linux-musl --build-arg OCAML_VERSION=5.1.1 --build-arg OCAMLFORMAT_VERSION=0.26.1
 
 ```
 
@@ -23,5 +23,5 @@ Creates a package archive containing a dynamically-linked `ocamlformat` and
 
 Example usage:
 ```
-$ TAG=2024-11-21.0 TARGET=aarch64-apple-darwin OCAML_VERSION=5.1.1 OCAMLFORMAT_VERSION=0.26.2 OUTPUT=$(pwd)/ocamlformat.0.26.2+binary-ocaml-5.1.1-built-2024-11-21.0-aarch64-apple-darwin.tar.gz ./build.sh
+$ TAG=2024-11-21.0 TARGET=aarch64-apple-darwin OCAML_VERSION=5.1.1 OCAMLFORMAT_VERSION=0.26.1 OUTPUT=$(pwd)/ocamlformat.0.26.1+binary-ocaml-5.1.1-built-2024-11-21.0-aarch64-apple-darwin.tar.gz ./build.sh
 ```