From 90180bfe2e9bd4799bec6a79bfca243012f68100 Mon Sep 17 00:00:00 2001 From: Krishna Vedala Date: Thu, 28 May 2020 17:56:46 -0400 Subject: [PATCH 1/8] temporarily enable DOXYGEN CI to test README.md fixes --- .github/workflows/gh-pages.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index aff5dcdce..f3aec275c 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -1,8 +1,9 @@ name: Doxygen CI on: - push: - branches: [master] + [push] + # push: + # branches: [master] jobs: build: From 1ef2e381fcb10e96417f0e07d181f880e5505205 Mon Sep 17 00:00:00 2001 From: Krishna Vedala Date: Thu, 28 May 2020 17:58:09 -0400 Subject: [PATCH 2/8] replace SVG images in markdown with HTML img tags --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b56c4f5f4..f166aaf0f 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # The Algorithms - C++ # {#mainpage} -[![contributions welcome](https://img.shields.io/static/v1.svg?label=Contributions&message=Welcome&color=0059b3&style=flat-square)](https://github.com/kvedala/C-Plus-Plus/blob/master/CONTRIBUTION.md)  +[contributions welcome](https://github.com/kvedala/C-Plus-Plus/blob/master/CONTRIBUTION.md) ![GitHub repo size](https://img.shields.io/github/repo-size/kvedala/C-Plus-Plus?color=red&style=flat-square) ![GitHub closed pull requests](https://img.shields.io/github/issues-pr-closed/kvedala/C-Plus-Plus?color=green&style=flat-square) -![Doxygen CI](https://github.com/kvedala/C-Plus-Plus/workflows/Doxygen%20CI/badge.svg) -![cpplint](https://github.com/kvedala/C-Plus-Plus/workflows/cpplint_modified_files/badge.svg) -![C/C++ CI](https://github.com/kvedala/C-Plus-Plus/workflows/C/C++%20CI/badge.svg) +Doxygen CI +cpplint status +C/C++ CI [Documentation](https://kvedala.github.io/C-Plus-Plus) From 9f9325e5f3192e423fc99c0805dde5b0b7a87698 Mon Sep 17 00:00:00 2001 From: Krishna Vedala Date: Thu, 28 May 2020 18:18:19 -0400 Subject: [PATCH 3/8] install doxygen via brew --- .github/workflows/gh-pages.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index f3aec275c..b24c36f3e 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -15,7 +15,8 @@ jobs: - name: Install requirements run: | sudo apt -qq -y update - sudo apt -qq install doxygen graphviz ninja-build + sudo apt -qq install graphviz ninja-build + sudo brew install doxygen - name: configure run: cmake -G Ninja -B ./build -S . - name: build From 4c3823ada32c54afdd0ad4ab48b141a71be82b0f Mon Sep 17 00:00:00 2001 From: Krishna Vedala Date: Thu, 28 May 2020 18:25:06 -0400 Subject: [PATCH 4/8] switch doxygen build to macos --- .github/workflows/gh-pages.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index b24c36f3e..c548dd05b 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -7,15 +7,14 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: macos-latest steps: - uses: actions/checkout@master with: submodules: true - name: Install requirements run: | - sudo apt -qq -y update - sudo apt -qq install graphviz ninja-build + sudo brew install graphviz ninja-build sudo brew install doxygen - name: configure run: cmake -G Ninja -B ./build -S . From f2a6b63c53a62ae8d60d38ed93ab954894e97929 Mon Sep 17 00:00:00 2001 From: Krishna Vedala Date: Thu, 28 May 2020 18:26:29 -0400 Subject: [PATCH 5/8] brew install without sudo --- .github/workflows/gh-pages.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index c548dd05b..9749b9b8d 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -14,8 +14,8 @@ jobs: submodules: true - name: Install requirements run: | - sudo brew install graphviz ninja-build - sudo brew install doxygen + brew install graphviz ninja-build + brew install doxygen - name: configure run: cmake -G Ninja -B ./build -S . - name: build From 5b58d7092c2bab4f8db614d81234f9e70dda7589 Mon Sep 17 00:00:00 2001 From: Krishna Vedala Date: Thu, 28 May 2020 18:29:48 -0400 Subject: [PATCH 6/8] brew uses "ninja" and not "ninja-build" --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 9749b9b8d..ed43f44ea 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -14,7 +14,7 @@ jobs: submodules: true - name: Install requirements run: | - brew install graphviz ninja-build + brew install graphviz ninja brew install doxygen - name: configure run: cmake -G Ninja -B ./build -S . From e3fbc6bc2c29296a30bffb8896c7fa2c2b7fcff2 Mon Sep 17 00:00:00 2001 From: Krishna Vedala Date: Thu, 28 May 2020 18:34:45 -0400 Subject: [PATCH 7/8] reset README.md file to using non-HTML tags --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f166aaf0f..b56c4f5f4 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # The Algorithms - C++ # {#mainpage} -[contributions welcome](https://github.com/kvedala/C-Plus-Plus/blob/master/CONTRIBUTION.md) +[![contributions welcome](https://img.shields.io/static/v1.svg?label=Contributions&message=Welcome&color=0059b3&style=flat-square)](https://github.com/kvedala/C-Plus-Plus/blob/master/CONTRIBUTION.md)  ![GitHub repo size](https://img.shields.io/github/repo-size/kvedala/C-Plus-Plus?color=red&style=flat-square) ![GitHub closed pull requests](https://img.shields.io/github/issues-pr-closed/kvedala/C-Plus-Plus?color=green&style=flat-square) -Doxygen CI -cpplint status -C/C++ CI +![Doxygen CI](https://github.com/kvedala/C-Plus-Plus/workflows/Doxygen%20CI/badge.svg) +![cpplint](https://github.com/kvedala/C-Plus-Plus/workflows/cpplint_modified_files/badge.svg) +![C/C++ CI](https://github.com/kvedala/C-Plus-Plus/workflows/C/C++%20CI/badge.svg) [Documentation](https://kvedala.github.io/C-Plus-Plus) From 11bb03f25579c223f848f02a876169c958739bfb Mon Sep 17 00:00:00 2001 From: Krishna Vedala Date: Thu, 28 May 2020 18:39:15 -0400 Subject: [PATCH 8/8] reset Doxygen CI to only execute on master branch --- .github/workflows/gh-pages.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index ed43f44ea..700d1a3f7 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -1,9 +1,8 @@ name: Doxygen CI on: - [push] - # push: - # branches: [master] + push: + branches: [master] jobs: build: @@ -14,8 +13,7 @@ jobs: submodules: true - name: Install requirements run: | - brew install graphviz ninja - brew install doxygen + brew install graphviz ninja doxygen - name: configure run: cmake -G Ninja -B ./build -S . - name: build