From 16ffcce38626dd9048a236a5c160718e82aac437 Mon Sep 17 00:00:00 2001 From: Feihong Hsu Date: Fri, 22 Nov 2024 10:24:42 -0600 Subject: [PATCH] Add talk videos to Resources page (#207) --- README.md | 19 +++++++++++++++++-- docs/resources.md | 4 +++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 133f79106..f02b9048c 100644 --- a/README.md +++ b/README.md @@ -52,8 +52,11 @@ dune build @re --auto-promote ## Publishing Publishing is done automatically from GitHub actions: -- Every commit to `master` will publish in the `unstable` folder -- Every tag pushed with the `v*` format will publish on its corresponding folder +- Every commit to `master` will publish in the `unstable` folder, i.e. + https://melange.re/unstable +- Every tag pushed with the `v*` format will publish to a folder with the same + name as the tag. For example, the branch with tag `v4.0.0` will publish to + https://melange.re/v4.0.0/. ### Tracking new versions of `melange` in opam @@ -100,3 +103,15 @@ move-vx.x.x-tag: ## Moves the vx.x.x tag to the latest commit, useful to publish - replace the default version with the new one [in index.html](https://github.com/melange-re/melange-re.github.io/blob/gh-pages/index.html#L10) - update `robots.txt` to point to the new version sitemap + +### Update docs for latest stable version + +After making changes in the `master` branch, you may want some or all of those +changes to appear in the latest stable version's docs. As an example, let's say +that the latest stable version is 4.0.0. Then you should: + +1. Checkout branch `4.0.0-patches` +1. Cherry pick the commits you want to add +1. Push your changes to the branch +1. Run `make move-v4.0.0-tag` to publish the branch to + https://melange.re/v4.0.0/ diff --git a/docs/resources.md b/docs/resources.md index 34f463527..8b8e7ebe5 100644 --- a/docs/resources.md +++ b/docs/resources.md @@ -6,7 +6,9 @@ The following are resources about Melange collected around the web. | Date | Type | Description | |----- | ---- | ----------- | -| Sep 2024 | talk | [Dillon Mulroy — Type-Safe React with OCaml](https://reactalicante.es/#schedule) (video not yet uploaded) | +| Sep 2024 | talk | [Dillon Mulroy — Type-Safe React with OCaml](https://youtu.be/dDNs2cniTQU) | +| Sep 2024 | talk | [Antonio Monteiro — A 'Melange' of Tooling Coming Together](https://youtu.be/3oCXT-ycHHs) | +| Sep 2024 | talk | [David Sancho — Universal React in OCaml](https://youtu.be/Oy3lZl2kE-0) | | Sep 2024 | podcast | [The State of Full-Stack OCaml (with António Monteiro)](https://pod.link/developer-voices/episode/4666dc4d7aa59599852c02b6415a36d4) ([video](https://www.youtube.com/watch?v=vSSpbAI_-t0)) | Jan 2024 | blog | [What's possible with Melange](https://sancho.dev/blog/whats-possible-with-melange) | Nov 2023 | talk | [Dillon Mulroy — Melange: The Next Frontier in Type-Safe Web Development](https://www.youtube.com/watch?v=zG7JejHlQoM)