From 34c07c354c4b33268185f6d4d63f110be5e1dbdd Mon Sep 17 00:00:00 2001 From: Luc Grosheintz Date: Mon, 3 Mar 2025 08:16:42 +0100 Subject: [PATCH 1/5] Deploy docs for `main` (not v2.x). --- .github/workflows/gh-pages.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 3d9c7d6c..ae2cd662 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -3,11 +3,10 @@ name: Documentation on: push: branches: - - v2.x + - main pull_request: branches: - v2.x - - master - main permissions: From ad3b479f365a6bd2e9b5891a7749a065a127db83 Mon Sep 17 00:00:00 2001 From: Luc Grosheintz Date: Mon, 3 Mar 2025 08:27:20 +0100 Subject: [PATCH 2/5] Use apt-get for dependencies. --- .github/workflows/gh-pages.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index ae2cd662..ff30bb97 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -34,13 +34,19 @@ jobs: submodules: 'recursive' fetch-depth: 0 - - name: Setup Micromamba - uses: mamba-org/setup-micromamba@v1 - with: - environment-file: doc/environment.yaml - environment-name: doc-build - cache-environment: true - cache-downloads: true + - name: Install dependencies + run: | + pkgs=( + doxygen + graphviz + libhdf5-dev + libboost-all-dev + libeigen3-dev + libxtensor-dev + ) + + sudo apt-get update + sudo apt-get install -y ${pkgs[@]} - name: Build documentation with CMake run: | From fef5f451bde17428762499a547fd3583a20f04ee Mon Sep 17 00:00:00 2001 From: Luc Grosheintz Date: Mon, 3 Mar 2025 08:28:47 +0100 Subject: [PATCH 3/5] Remove docs/environment.yml --- doc/environment.yaml | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 doc/environment.yaml diff --git a/doc/environment.yaml b/doc/environment.yaml deleted file mode 100644 index a08f03e8..00000000 --- a/doc/environment.yaml +++ /dev/null @@ -1,12 +0,0 @@ -channels: - - conda-forge -dependencies: - - boost-cpp - - catch2 - - cmake - - doxygen - - eigen - - graphviz - - hdf5 - - xtensor - - xtl From 03976e0ba957bdd0d80a4366dde9041b1ba2effd Mon Sep 17 00:00:00 2001 From: Luc Grosheintz Date: Mon, 3 Mar 2025 21:58:54 +0100 Subject: [PATCH 4/5] Revert "Remove docs/environment.yml" This reverts commit fef5f451bde17428762499a547fd3583a20f04ee. --- doc/environment.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/environment.yaml diff --git a/doc/environment.yaml b/doc/environment.yaml new file mode 100644 index 00000000..a08f03e8 --- /dev/null +++ b/doc/environment.yaml @@ -0,0 +1,12 @@ +channels: + - conda-forge +dependencies: + - boost-cpp + - catch2 + - cmake + - doxygen + - eigen + - graphviz + - hdf5 + - xtensor + - xtl From ff3d92da6888243de044b952cd949280c77435e2 Mon Sep 17 00:00:00 2001 From: Luc Grosheintz Date: Mon, 3 Mar 2025 22:00:53 +0100 Subject: [PATCH 5/5] Move doc/environment.yaml -> .github/mamba_env.yaml The Windows CI needs it. --- doc/environment.yaml => .github/mamba_env.yaml | 0 .github/workflows/ci.yml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename doc/environment.yaml => .github/mamba_env.yaml (100%) diff --git a/doc/environment.yaml b/.github/mamba_env.yaml similarity index 100% rename from doc/environment.yaml rename to .github/mamba_env.yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index db279695..0643302f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -362,7 +362,7 @@ jobs: - uses: mamba-org/setup-micromamba@v1 with: - environment-file: doc/environment.yaml + environment-file: .github/mamba_env.yaml environment-name: win-test - name: Build