Skip to content

Commit 55970e0

Browse files
Merge pull request #104 from goblint/dune
Port entire build process from configure/make to dune
2 parents 54b0c22 + 987cf2c commit 55970e0

Some content is hidden

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

47 files changed

+360
-13747
lines changed

.github/workflows/docs.yml

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
name: Build and Deploy Docs
1+
name: docs
22
on:
33
push:
4-
branches:
5-
- develop
4+
65
permissions:
76
contents: write
87
jobs:
9-
build-and-deploy:
8+
build:
109
concurrency: ci-${{ github.ref }} # Recommended if you intend to make multiple deployments in quick succession.
1110
runs-on: ubuntu-latest
1211
steps:
1312
- name: Checkout 🛎️
1413
uses: actions/checkout@v3
14+
with:
15+
fetch-depth: 0 # fetch all history such that subst gives nice version
1516

1617
- name: Setup OCaml ${{ matrix.ocaml-version }}
1718
uses: ocaml/setup-ocaml@v2
@@ -21,16 +22,27 @@ jobs:
2122
- run: opam pin add goblint-cil.dev . --no-action
2223
- run: opam depext goblint-cil --yes
2324
- run: opam depext goblint-cil --yes --with-doc
24-
- run: opam depext goblint-cil --yes --with-test
25-
- run: opam install . --deps-only --with-doc --with-test
26-
- run: eval $(opam env)
25+
- run: opam install . --deps-only --with-doc
2726
- 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.
2827
run: |
29-
opam exec -- ./configure
30-
opam exec -- make
31-
opam exec -- make doc
28+
opam exec -- dune subst
29+
opam exec -- dune build @heveadoc
30+
31+
- uses: actions/upload-artifact@v3
32+
with:
33+
name: doc-html
34+
path: _build/default/doc/html/cil
35+
36+
deploy:
37+
if: github.ref == 'refs/heads/develop'
38+
needs: build
39+
runs-on: ubuntu-latest
40+
steps:
41+
- uses: actions/download-artifact@v3
42+
with:
43+
name: doc-html
3244

3345
- name: Deploy 🚀
3446
uses: JamesIves/github-pages-deploy-action@v4
3547
with:
36-
folder: doc/html/cil # The folder the action should deploy.
48+
folder: .

.github/workflows/tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ jobs:
4141

4242
- run: opam pin add goblint-cil.dev . --no-action
4343
- run: opam depext goblint-cil --yes
44-
- run: opam depext goblint-cil --yes --with-doc
4544
- run: opam depext goblint-cil --yes --with-test
46-
- run: opam install . --deps-only --with-doc --with-test
45+
- run: opam install . --deps-only --with-test
4746
- run: opam exec -- dune build
4847
- run: opam exec -- dune runtest
4948

.gitignore

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,8 @@ src/.merlin
7575
/doc/cilpp.tex
7676
/doc/cilcode.tmp
7777
/doc/cil.version
78-
/doc/header.html
79-
/doc/index.html
8078
/doc/ocamldoc.sty
8179

82-
# /doc/html/
83-
/doc/html/*
84-
8580
# /lib/perl5/
8681
/lib/perl5/App/Cilly/CilConfig.pm
8782
/lib/perl5/App/Cilly.pm
@@ -108,8 +103,6 @@ src/.merlin
108103
# /src/
109104
/src/*.output
110105
/src/ChangeLog
111-
/src/machdep-ml.c
112-
/src/cilversion.ml
113106
/src/feature_config.ml
114107
/src/machdep.ml
115108

.merlin

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)