From a73b3095696a0f4ed48fdf6a1c91a86f8c0c8bcc Mon Sep 17 00:00:00 2001 From: Daniel Oliveira Date: Fri, 28 Jul 2023 11:05:34 +0100 Subject: [PATCH 1/7] feat(ci): add ci submodule Signed-off-by: Daniel Oliveira --- .gitmodules | 3 +++ bao-ci | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 bao-ci diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..2b1fb12 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "bao-ci"] + path = bao-ci + url = git@github.com:bao-project/bao-ci.git diff --git a/bao-ci b/bao-ci new file mode 160000 index 0000000..3003881 --- /dev/null +++ b/bao-ci @@ -0,0 +1 @@ +Subproject commit 3003881da1cc447a484fd257690f248da68bd953 From 970973d5dd7a4d86b9049724f83bfec5c0d819dd Mon Sep 17 00:00:00 2001 From: Daniel Oliveira Date: Fri, 28 Jul 2023 11:28:28 +0100 Subject: [PATCH 2/7] fix(workflow): change format-check run command Signed-off-by: Daniel Oliveira --- .github/workflows/base-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/base-ci.yml b/.github/workflows/base-ci.yml index 4e6621e..1f2a08d 100644 --- a/.github/workflows/base-ci.yml +++ b/.github/workflows/base-ci.yml @@ -29,7 +29,7 @@ jobs: container: baoproject/bao:latest steps: - uses: actions/checkout@v2 - - run: | + - run: | git config --global --add safe.directory $(realpath .) make spelling @@ -38,7 +38,7 @@ jobs: container: baoproject/bao:latest steps: - uses: actions/checkout@v2 - - run: doc8 source/ --ignore D000 + - run: make format build: runs-on: ubuntu-latest From 83b4326716eb87f81282da87ee266bf08a88b55f Mon Sep 17 00:00:00 2001 From: Daniel Oliveira Date: Fri, 15 Sep 2023 13:07:16 +0100 Subject: [PATCH 3/7] fix(submodules): change ci path Signed-off-by: Daniel Oliveira --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 2b1fb12..5960387 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "bao-ci"] - path = bao-ci + path = ci url = git@github.com:bao-project/bao-ci.git From 0788649c696dc4a4d8841ae77fbf59d91aead73b Mon Sep 17 00:00:00 2001 From: Daniel Oliveira Date: Fri, 15 Sep 2023 13:09:35 +0100 Subject: [PATCH 4/7] ref(gh-actions): change rst format github action Signed-off-by: Daniel Oliveira --- .github/workflows/base-ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/base-ci.yml b/.github/workflows/base-ci.yml index 1f2a08d..c73b454 100644 --- a/.github/workflows/base-ci.yml +++ b/.github/workflows/base-ci.yml @@ -33,12 +33,15 @@ jobs: git config --global --add safe.directory $(realpath .) make spelling - format-check: + docformat: runs-on: ubuntu-latest container: baoproject/bao:latest steps: - uses: actions/checkout@v2 - - run: make format + with: + fetch-depth: 0 + submodules: recursive + - run: make rst-format build: runs-on: ubuntu-latest From eec2adf25b7e46a49ce2db7ed275ad07acf418e7 Mon Sep 17 00:00:00 2001 From: Daniel Oliveira Date: Fri, 15 Sep 2023 13:11:30 +0100 Subject: [PATCH 5/7] fix(makefile): add ci.mk instantiation Signed-off-by: Daniel Oliveira --- Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 2d49756..c1736dc 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # Minimal makefile for Sphinx documentation # - +root_dir:=$(realpath .) # You can set these variables from the command line, and also # from the environment for the first two. SPHINXOPTS ?= -W -a @@ -12,16 +12,17 @@ BUILDDIR = build help: @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) -.PHONY: help format Makefile ci +.PHONY: help + +# Instantiate CI rules +include ci/ci.mk -# doc8 format checker -# Checks the format of the reST sources. -format: - @doc8 source/ --ignore D000 +$(call ci, rstformat, $(SOURCEDIR)) # Catch-all target: route all unknown targets to Sphinx using the new # "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). -%: Makefile +%: @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) -ci: format html spelling +ci: rst-format html spelling +.PHONY: ci From 718f7c5713084e61df8769700807459c06067e35 Mon Sep 17 00:00:00 2001 From: Daniel Oliveira Date: Fri, 15 Sep 2023 14:16:26 +0100 Subject: [PATCH 6/7] update(ci): update ci submodule Signed-off-by: Daniel Oliveira --- .gitmodules | 2 +- ci | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 160000 ci diff --git a/.gitmodules b/.gitmodules index 5960387..f38184b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "bao-ci"] +[submodule "ci"] path = ci url = git@github.com:bao-project/bao-ci.git diff --git a/ci b/ci new file mode 160000 index 0000000..fd9396a --- /dev/null +++ b/ci @@ -0,0 +1 @@ +Subproject commit fd9396a0c7774ea971e172f841cc0a81344e3fa7 From 73e50c64bd65b4350a5c86b29bbe4a056a6c068c Mon Sep 17 00:00:00 2001 From: Daniel Oliveira Date: Mon, 25 Sep 2023 18:27:12 +0100 Subject: [PATCH 7/7] fix(gh-actions): add submodule update to checker rules Signed-off-by: Daniel Oliveira --- .github/workflows/base-ci.yml | 6 ++++++ bao-ci | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) delete mode 160000 bao-ci diff --git a/.github/workflows/base-ci.yml b/.github/workflows/base-ci.yml index c73b454..a44a940 100644 --- a/.github/workflows/base-ci.yml +++ b/.github/workflows/base-ci.yml @@ -29,6 +29,9 @@ jobs: container: baoproject/bao:latest steps: - uses: actions/checkout@v2 + with: + fetch-depth: 0 + submodules: recursive - run: | git config --global --add safe.directory $(realpath .) make spelling @@ -48,4 +51,7 @@ jobs: container: baoproject/bao:latest steps: - uses: actions/checkout@v2 + with: + fetch-depth: 0 + submodules: recursive - run: make html diff --git a/bao-ci b/bao-ci deleted file mode 160000 index 3003881..0000000 --- a/bao-ci +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3003881da1cc447a484fd257690f248da68bd953