Merge pull request #767 from reasonml/main

reasonml · Dec 1, 2023 · 8e32464 · 8e32464
2 parents 2096f5c + 5e2b132
commit 8e32464
Show file tree

Hide file tree

Showing 520 changed files with 88,436 additions and 33,306 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,37 @@
+name: Build and Deploy
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Set up Node.js
+      uses: actions/setup-node@v2
+      with:
+        node-version: '20'
+
+    - name: Install generate-docs dependencies
+      run: cd generate-docs; ./install-dependencies.sh
+
+    - name: Run generate-docs
+      run: cd generate-docs; ./build-docs.sh
+
+    - name: Install website dependencies
+      run: cd website; npm install
+
+    - name: Build website
+      run: cd website; npm run build
+
+    - name: Deploy to GitHub Pages
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        publish_dir: ./website/build
diff --git a/docs/what-and-why.md b/docs/what-and-why.md
@@ -12,15 +12,6 @@ Notably versatile, Reason serves as an excellent choice for a range of applicati
 
 ## Why Use Reason?
 
-<iframe
-  width="784"
-  height="432"
-  src="https://www.youtube.com/embed/5fG_lyNuEAw?si=HPFaMIMIX0Krn2wK"
-  title="Jordan Walke - Keynote ReasonConf US 2019"
-  frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
-  allowfullscreen>
-</iframe>
-
 **Functional Programming**
 
 Reason is a practical functional programming language. Offers a powerful blend of functional programming capabilities, with optional support for mutation and side-effects, enhancing its practicality.
@@ -45,6 +36,15 @@ JSX is part of the language. JSX is an embeddable XML-like syntax, used to descr
 
 Reason can be compiled to native, bytecode, and JavaScript, with an ongoing plan for WebAssembly.
 
+<iframe
+  width="784"
+  height="432"
+  src="https://www.youtube.com/embed/5fG_lyNuEAw?si=HPFaMIMIX0Krn2wK"
+  title="Jordan Walke - Keynote ReasonConf US 2019"
+  frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+  allowfullscreen>
+</iframe>
+
 ## Different Environments
 
 Reason compiles to JavaScript thanks to our partner project, [Melange](compiling-to-js-with-melange.md), which compiles OCaml/Reason into JavaScript with smooth interoperability with JavaScript. Reason also compiles to fast, barebone assembly, thanks to OCaml itself.

diff --git a/generate-docs/README.md b/generate-docs/README.md
@@ -2,7 +2,7 @@ How to generate Reason API docs from OCaml
 
 ```bash
 ./install-dependencies.sh
-./build-docs.sh 
+./build-docs.sh
 ```
 
 Converted HTML is now in `output/`
diff --git a/generate-docs/build-docs.sh b/generate-docs/build-docs.sh
@@ -9,7 +9,7 @@ docs_path="../website/pages/api/"
 
 mkdir -p ./output/
 rm -f ./output/*.html
-cp ocaml/ocamldoc/stdlib_html/*.html ./output/
+cp ocaml/api_docgen/ocamldoc/build/html/libref/*.html ./output/
 echo ""
 echo "converting docs - this will take a minute"
 echo ""

diff --git a/generate-docs/install-dependencies.sh b/generate-docs/install-dependencies.sh
@@ -8,7 +8,7 @@ if [[ ! -d "ocaml/" ]]; then
 fi
 cd ocaml/
 
-git checkout 4.02.3
+git checkout 5.0
 ./configure
 make clean
 make world