Skip to content

Commit 8e32464

Browse files
authored
Merge pull request #767 from reasonml/main
2 parents 2096f5c + 5e2b132 commit 8e32464

File tree

520 files changed

+88436
-33306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

520 files changed

+88436
-33306
lines changed

.github/workflows/ci.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Build and Deploy
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- name: Checkout repository
14+
uses: actions/checkout@v2
15+
16+
- name: Set up Node.js
17+
uses: actions/setup-node@v2
18+
with:
19+
node-version: '20'
20+
21+
- name: Install generate-docs dependencies
22+
run: cd generate-docs; ./install-dependencies.sh
23+
24+
- name: Run generate-docs
25+
run: cd generate-docs; ./build-docs.sh
26+
27+
- name: Install website dependencies
28+
run: cd website; npm install
29+
30+
- name: Build website
31+
run: cd website; npm run build
32+
33+
- name: Deploy to GitHub Pages
34+
uses: peaceiris/actions-gh-pages@v3
35+
with:
36+
github_token: ${{ secrets.GITHUB_TOKEN }}
37+
publish_dir: ./website/build

docs/what-and-why.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,6 @@ Notably versatile, Reason serves as an excellent choice for a range of applicati
1212

1313
## Why Use Reason?
1414

15-
<iframe
16-
width="784"
17-
height="432"
18-
src="https://www.youtube.com/embed/5fG_lyNuEAw?si=HPFaMIMIX0Krn2wK"
19-
title="Jordan Walke - Keynote ReasonConf US 2019"
20-
frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
21-
allowfullscreen>
22-
</iframe>
23-
2415
**Functional Programming**
2516

2617
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
4536

4637
Reason can be compiled to native, bytecode, and JavaScript, with an ongoing plan for WebAssembly.
4738

39+
<iframe
40+
width="784"
41+
height="432"
42+
src="https://www.youtube.com/embed/5fG_lyNuEAw?si=HPFaMIMIX0Krn2wK"
43+
title="Jordan Walke - Keynote ReasonConf US 2019"
44+
frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
45+
allowfullscreen>
46+
</iframe>
47+
4848
## Different Environments
4949

5050
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.

generate-docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ How to generate Reason API docs from OCaml
22

33
```bash
44
./install-dependencies.sh
5-
./build-docs.sh
5+
./build-docs.sh
66
```
77

88
Converted HTML is now in `output/`

generate-docs/build-docs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ docs_path="../website/pages/api/"
99

1010
mkdir -p ./output/
1111
rm -f ./output/*.html
12-
cp ocaml/ocamldoc/stdlib_html/*.html ./output/
12+
cp ocaml/api_docgen/ocamldoc/build/html/libref/*.html ./output/
1313
echo ""
1414
echo "converting docs - this will take a minute"
1515
echo ""

generate-docs/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if [[ ! -d "ocaml/" ]]; then
88
fi
99
cd ocaml/
1010

11-
git checkout 4.02.3
11+
git checkout 5.0
1212
./configure
1313
make clean
1414
make world

0 commit comments

Comments
 (0)