From bf8fd17e60cacd6ef5c83d46f207565b6ae0b500 Mon Sep 17 00:00:00 2001 From: Fabrice Le Fessant Date: Thu, 14 Sep 2023 11:26:47 +0200 Subject: [PATCH] fix workflow for submodules --- .drom | 6 +++--- .github/workflows/workflow.yml | 5 +++++ drom.toml | 12 ++++++++++-- sphinx/conf.py | 16 ++++++++-------- 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/.drom b/.drom index e41293405..d4ddbfd17 100644 --- a/.drom +++ b/.drom @@ -5,12 +5,12 @@ version:0.9.0 # hash of toml configuration files # used for generation of all files -c6ace88d19f3763a350e4a04f2928196:. +e826f3f68255dde9040054031ea84063:. # end context for . # begin context for .github/workflows/workflow.yml # file .github/workflows/workflow.yml -dec859d35759b2ae3af7975eb7e00f2e:.github/workflows/workflow.yml +dd69a97e5bf6ece8ff713acb50c1c71b:.github/workflows/workflow.yml # end context for .github/workflows/workflow.yml # begin context for .gitignore @@ -245,7 +245,7 @@ a4431c32911b7499fbdc49e2e62932d2:sphinx/about.rst # begin context for sphinx/conf.py # file sphinx/conf.py -6bf90eb136d7e3eb588a87a4f0c39c35:sphinx/conf.py +0f6a35278b93d5d9ceca6431677766e6:sphinx/conf.py # end context for sphinx/conf.py # begin context for sphinx/index.rst diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 91c3db2ff..c14d21b65 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -72,6 +72,11 @@ jobs: # Use fields.github-workflow-before-build to add something here + - run: git submodule init + + - run: git submodule update + + - run: make build # Use fields.github-workflow-after-build to add something here diff --git a/drom.toml b/drom.toml index 1ca7bdf12..d18c8ca2d 100644 --- a/drom.toml +++ b/drom.toml @@ -33,7 +33,7 @@ of the superbol-vscode-platform OCaml project """ [project] -skip = ["@test", "@ocamlformat", "@ocp-indent", "README.md"] +skip = ["@test", "@ocamlformat", "@ocp-indent", "README.md", "sphinx/about.rst", "LICENSE.md"] # project-wide library dependencies (not for package-specific deps) [dependencies] @@ -51,7 +51,7 @@ for-test = true [project] # dirs to skip while scanning for dune files -skip-dirs = ["node_modules"] +skip-dirs = ["node_modules" ] # dirs to scan for share/ folders (with package names) share-dirs = ["share"] @@ -85,6 +85,14 @@ ATTIC !.vscode/launch.json *.vsix """ +github-workflow-before-build = """ + + - run: git submodule init + + - run: git submodule update + +""" + [[package]] dir = "src/vscode/superbol-vscode-platform" diff --git a/sphinx/conf.py b/sphinx/conf.py index d09a2e675..0d6be8589 100644 --- a/sphinx/conf.py +++ b/sphinx/conf.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- # -# superbol-vscode-platform documentation build configuration file, created by +# superbol documentation build configuration file, created by # sphinx-quickstart. # # This file is execfile()d with the current directory set to its @@ -50,9 +50,9 @@ master_doc = 'index' # General information about the project. -project = 'superbol-vscode-platform' +project = 'superbol' copyright = 'OCamlPro SAS' -author = 'Fabrice Le Fessant & Emilien Lemaire ' +author = 'Nicolas Berthier & David Declerck & Fabrice Le Fessant & Emilien Lemaire ' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -167,7 +167,7 @@ # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - (master_doc, 'superbol-vscode-platform.tex', 'superbol-vscode-platform Documentation', + (master_doc, 'superbol.tex', 'superbol Documentation', 'author', 'manual'), ] @@ -177,7 +177,7 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - (master_doc, 'superbol-vscode-platform', 'superbol-vscode-platform Documentation', + (master_doc, 'superbol', 'superbol Documentation', [author], 1) ] @@ -188,8 +188,8 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - (master_doc, 'superbol-vscode-platform', 'superbol-vscode-platform Documentation', - author, 'superbol-vscode-platform', 'One line description of project.', + (master_doc, 'superbol', 'superbol Documentation', + author, 'superbol', 'One line description of project.', 'Miscellaneous'), ] @@ -220,4 +220,4 @@ # entry point for setup def setup(app): - app.add_stylesheet('css/fixes.css') + app.add_css_file('css/fixes.css')