Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
9f72ddf
Port machdep.ml generation to dune
sim642 Jul 15, 2022
c2eb0d9
Fix Machdep0 formatting
sim642 Jul 15, 2022
e7dfe53
Port machdep-ml.c generation to dune
sim642 Jul 15, 2022
4220eef
Port some config.h generation to dune
sim642 Jul 15, 2022
7941e4e
Port remaining config.h generation to dune
sim642 Jul 15, 2022
6d0e2d1
Port testing to dune
sim642 Jul 15, 2022
094a4e6
Use cppo to generate machdep.ml
sim642 Jul 16, 2022
6c8b4da
Port cilversion.ml generation to dune
sim642 Jul 16, 2022
5116ff4
Port CilConfig.pm generation to dune
sim642 Jul 16, 2022
a45ccb6
Port Cilly.pm generation to dune
sim642 Jul 16, 2022
58c4d18
Remove config.mk dependency from test/Makefile
sim642 Jul 16, 2022
29b3e2a
Remove configure from dune build
sim642 Jul 16, 2022
b255010
Port hevea documentation generation to dune
sim642 Jul 16, 2022
0f92cdd
Undo directory-targets because globbing _doc is buggy
sim642 Jul 16, 2022
07e39fd
Remove unused cil.version.tex
sim642 Jul 16, 2022
b17004f
Move hevea index and header to final directory
sim642 Jul 16, 2022
2506538
Fix api URLs in TeX
sim642 Jul 16, 2022
3293929
Fix incorrect \apiref usage
sim642 Jul 16, 2022
0d06220
Merge branch 'develop' into dune
sim642 Jul 16, 2022
d8adb7b
Remove useless opam env from docs workflow
sim642 Jul 16, 2022
7994889
Remove with-test from docs workflow
sim642 Jul 16, 2022
ac02484
Remove with-doc from tests workflow
sim642 Jul 16, 2022
a42e1c0
Switch docs workflow to dune
sim642 Jul 16, 2022
a1e3458
Remove make build
sim642 Jul 16, 2022
b36376f
Remove ocamlbuild leftovers
sim642 Jul 16, 2022
d08fa64
Fix rm __html__cil__examples when not present
sim642 Jul 16, 2022
173073c
Add bin/cilly to cilly alias
sim642 Jul 16, 2022
b3a5000
Make ocamlfind with-test dependency
sim642 Jul 16, 2022
662247a
Add dune-configurator dependency
sim642 Jul 16, 2022
3d79fd3
Exclude doc from default dune alias
sim642 Jul 16, 2022
9457659
Hardcode gcc as C compiler
sim642 Jul 16, 2022
6dc2dc8
Build docs (without deploy) on all branches
sim642 Jul 16, 2022
e44490e
Split docs workflow into jobs
sim642 Jul 16, 2022
80206a7
Fix docs deploy folder after download-artifact
sim642 Jul 16, 2022
9f62428
Revert "Hardcode gcc as C compiler"
sim642 Jul 16, 2022
f929952
Add hack for finding real gcc, especially on MacOS
sim642 Jul 16, 2022
10aaa48
Fetch all history in docs workflow
sim642 Jul 16, 2022
70cf90f
Fix gcc32model on MacOS
sim642 Jul 16, 2022
6a81620
Fix missing enabled_if on machdep-ml32.exe
sim642 Jul 16, 2022
987cf2c
Some readme updates
michael-schwarz Jul 18, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 23 additions & 11 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
name: Build and Deploy Docs
name: docs
on:
push:
branches:
- develop

permissions:
contents: write
jobs:
build-and-deploy:
build:
concurrency: ci-${{ github.ref }} # Recommended if you intend to make multiple deployments in quick succession.
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
with:
fetch-depth: 0 # fetch all history such that subst gives nice version

- name: Setup OCaml ${{ matrix.ocaml-version }}
uses: ocaml/setup-ocaml@v2
Expand All @@ -21,16 +22,27 @@ jobs:
- run: opam pin add goblint-cil.dev . --no-action
- run: opam depext goblint-cil --yes
- run: opam depext goblint-cil --yes --with-doc
- run: opam depext goblint-cil --yes --with-test
- run: opam install . --deps-only --with-doc --with-test
- run: eval $(opam env)
- run: opam install . --deps-only --with-doc
- name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
run: |
opam exec -- ./configure
opam exec -- make
opam exec -- make doc
opam exec -- dune subst
opam exec -- dune build @heveadoc

- uses: actions/upload-artifact@v3
with:
name: doc-html
path: _build/default/doc/html/cil

deploy:
if: github.ref == 'refs/heads/develop'
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/download-artifact@v3
with:
name: doc-html

- name: Deploy 🚀
uses: JamesIves/github-pages-deploy-action@v4
with:
folder: doc/html/cil # The folder the action should deploy.
folder: .
3 changes: 1 addition & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,8 @@ jobs:

- run: opam pin add goblint-cil.dev . --no-action
- run: opam depext goblint-cil --yes
- run: opam depext goblint-cil --yes --with-doc
- run: opam depext goblint-cil --yes --with-test
- run: opam install . --deps-only --with-doc --with-test
- run: opam install . --deps-only --with-test
- run: opam exec -- dune build
- run: opam exec -- dune runtest

Expand Down
7 changes: 0 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,8 @@ src/.merlin
/doc/cilpp.tex
/doc/cilcode.tmp
/doc/cil.version
/doc/header.html
/doc/index.html
/doc/ocamldoc.sty

# /doc/html/
/doc/html/*

# /lib/perl5/
/lib/perl5/App/Cilly/CilConfig.pm
/lib/perl5/App/Cilly.pm
Expand All @@ -108,8 +103,6 @@ src/.merlin
# /src/
/src/*.output
/src/ChangeLog
/src/machdep-ml.c
/src/cilversion.ml
/src/feature_config.ml
/src/machdep.ml

Expand Down
13 changes: 0 additions & 13 deletions .merlin

This file was deleted.

Loading