From 0b908d45ac7c0323e3f789aacbf0a49e2c0c904f Mon Sep 17 00:00:00 2001 From: Bertrand Kerautret Date: Fri, 17 Nov 2023 14:45:21 +0100 Subject: [PATCH 1/3] add prepare doc deploy --- .github/workflows/buildAndDocumentation.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/buildAndDocumentation.yml b/.github/workflows/buildAndDocumentation.yml index d5f84b2b..16710eba 100644 --- a/.github/workflows/buildAndDocumentation.yml +++ b/.github/workflows/buildAndDocumentation.yml @@ -164,14 +164,21 @@ jobs: cmake .. -DDGtal_DIR=${{runner.workspace}}/DGtal/buildDGtal wget --no-check-certificate -O "${{runner.workspace}}/DGtalTools/build/DGtal-tagfile" http://dgtal.org/doc/tags/DGtal-tagfile; make doc > buildDoc.log - + - name: Preparing deploy + run: | + git clone --depth 2 https://github.com/DGtal-team/doctools-nightly.git + ls build/ + pwd + du -hs build/html + cd build/html + cp -r * ../../doctools-nightly/ - name: Deploy to GitHub Pages - uses: JamesIves/github-pages-deploy-action@4.1.4 - if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true + uses: JamesIves/github-pages-deploy-action@4.4.1 +# if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true with: - token: ${{ secrets.DEPLOYTOKEN }} - branch: master + token: ${{ secrets.DEPLOYACTION }} repository-name: DGtal-team/doctools-nightly folder: build/html + branch: master single-comit: true clean: true From e13f79378a4bd4a3f475fdf68adb8be4cfb19e18 Mon Sep 17 00:00:00 2001 From: Bertrand Kerautret Date: Fri, 17 Nov 2023 14:51:39 +0100 Subject: [PATCH 2/3] typo deploy version --- .github/workflows/buildAndDocumentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildAndDocumentation.yml b/.github/workflows/buildAndDocumentation.yml index 16710eba..79dffdbf 100644 --- a/.github/workflows/buildAndDocumentation.yml +++ b/.github/workflows/buildAndDocumentation.yml @@ -173,7 +173,7 @@ jobs: cd build/html cp -r * ../../doctools-nightly/ - name: Deploy to GitHub Pages - uses: JamesIves/github-pages-deploy-action@4.4.1 + uses: JamesIves/github-pages-deploy-action@v4.4.1 # if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true with: token: ${{ secrets.DEPLOYACTION }} From 711943e19253bdd176da74168e116a8355289e37 Mon Sep 17 00:00:00 2001 From: Bertrand Kerautret Date: Wed, 12 Jun 2024 16:07:03 +0200 Subject: [PATCH 3/3] change log --- ChangeLog.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index 7d449b35..53bdfea7 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,8 @@ # DGtalTools 1.5 (beta) +- *build* + - Fix DGtalTools doc deployement. + (David Coeurjolly and Bertrand Kerautret [#454](https://github.com/DGtal-team/DGtalTools/pull/454)) # DGtalTools 1.4