From 5700f64ce0f928c01cea5b3961b775d6fb2555e6 Mon Sep 17 00:00:00 2001 From: Will Jones Date: Mon, 21 Apr 2025 08:46:50 -0700 Subject: [PATCH 01/10] ci: fix docs deploy --- .github/workflows/docs-deploy.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml index f5f40b80ac8..c2b6b79e933 100644 --- a/.github/workflows/docs-deploy.yml +++ b/.github/workflows/docs-deploy.yml @@ -7,6 +7,10 @@ on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: + pull_request: + paths: + - ".github/workflows/docs-deploy.yml" + # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages permissions: contents: read @@ -44,9 +48,12 @@ jobs: cache-dependency-path: "docs/requirements.txt" - name: Install dependencies run: | + sudo apt update sudo apt install -y -qq doxygen pandoc - name: Build python wheel uses: ./.github/workflows/build_linux_wheel + - name: Free disk space + run: cargo clean - name: Build Python working-directory: python run: | @@ -58,11 +65,14 @@ jobs: make nbconvert make html - name: Setup Pages + if: ${{ github.event_name != 'pull_request' }} uses: actions/configure-pages@v5 - name: Upload artifact + if: ${{ github.event_name != 'pull_request' }} uses: actions/upload-pages-artifact@v3 with: path: 'docs/_build/html' - name: Deploy to GitHub Pages + if: ${{ github.event_name != 'pull_request' }} id: deployment uses: actions/deploy-pages@v4 From 798c504089c4ca3de06495b04a9958ab9a6d594d Mon Sep 17 00:00:00 2001 From: Will Jones Date: Mon, 21 Apr 2025 08:51:07 -0700 Subject: [PATCH 02/10] use less disk space --- .github/workflows/docs-check.yml | 6 +++--- .github/workflows/docs-deploy.yml | 12 +----------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/docs-check.yml b/.github/workflows/docs-check.yml index d4e3dc810b5..4bbee2283d1 100644 --- a/.github/workflows/docs-check.yml +++ b/.github/workflows/docs-check.yml @@ -10,9 +10,7 @@ on: - .github/workflows/docs-check.yml env: - # Disable full debug symbol generation to speed up CI build and keep memory down - # "1" means line tables only, which is useful for panic tracebacks. - RUSTFLAGS: "-C debuginfo=1" + RUSTFLAGS: "-C debuginfo=0" # according to: https://matklad.github.io/2021/09/04/fast-rust-builds.html # CI builds are faster with incremental disabled. CARGO_INCREMENTAL: "0" @@ -35,6 +33,8 @@ jobs: sudo apt install -y -qq doxygen pandoc - name: Build python wheel uses: ./.github/workflows/build_linux_wheel + - name: Free disk space + run: cargo clean - name: Build Python working-directory: docs run: | diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml index c2b6b79e933..3fb2b0865ec 100644 --- a/.github/workflows/docs-deploy.yml +++ b/.github/workflows/docs-deploy.yml @@ -7,10 +7,6 @@ on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: - pull_request: - paths: - - ".github/workflows/docs-deploy.yml" - # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages permissions: contents: read @@ -23,9 +19,7 @@ concurrency: cancel-in-progress: true env: - # Disable full debug symbol generation to speed up CI build and keep memory down - # "1" means line tables only, which is useful for panic tracebacks. - RUSTFLAGS: "-C debuginfo=1" + RUSTFLAGS: "-C debuginfo=0" # according to: https://matklad.github.io/2021/09/04/fast-rust-builds.html # CI builds are faster with incremental disabled. CARGO_INCREMENTAL: "0" @@ -48,7 +42,6 @@ jobs: cache-dependency-path: "docs/requirements.txt" - name: Install dependencies run: | - sudo apt update sudo apt install -y -qq doxygen pandoc - name: Build python wheel uses: ./.github/workflows/build_linux_wheel @@ -65,14 +58,11 @@ jobs: make nbconvert make html - name: Setup Pages - if: ${{ github.event_name != 'pull_request' }} uses: actions/configure-pages@v5 - name: Upload artifact - if: ${{ github.event_name != 'pull_request' }} uses: actions/upload-pages-artifact@v3 with: path: 'docs/_build/html' - name: Deploy to GitHub Pages - if: ${{ github.event_name != 'pull_request' }} id: deployment uses: actions/deploy-pages@v4 From f0ea531f3f7274d7ca9921c394aac2e0b985df88 Mon Sep 17 00:00:00 2001 From: Will Jones Date: Mon, 21 Apr 2025 09:04:47 -0700 Subject: [PATCH 03/10] correct directory --- .github/workflows/docs-check.yml | 1 + .github/workflows/docs-deploy.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/docs-check.yml b/.github/workflows/docs-check.yml index 4bbee2283d1..4c8d9b140df 100644 --- a/.github/workflows/docs-check.yml +++ b/.github/workflows/docs-check.yml @@ -34,6 +34,7 @@ jobs: - name: Build python wheel uses: ./.github/workflows/build_linux_wheel - name: Free disk space + working-directory: python run: cargo clean - name: Build Python working-directory: docs diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml index 3fb2b0865ec..86ef8cb2821 100644 --- a/.github/workflows/docs-deploy.yml +++ b/.github/workflows/docs-deploy.yml @@ -46,6 +46,7 @@ jobs: - name: Build python wheel uses: ./.github/workflows/build_linux_wheel - name: Free disk space + working-directory: python run: cargo clean - name: Build Python working-directory: python From d498fcd4b3423afa9d18badf3b96e0384687f7e3 Mon Sep 17 00:00:00 2001 From: Will Jones Date: Mon, 21 Apr 2025 09:58:39 -0700 Subject: [PATCH 04/10] try this --- .github/workflows/docs-check.yml | 2 +- .github/workflows/docs-deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs-check.yml b/.github/workflows/docs-check.yml index 4c8d9b140df..42338d43240 100644 --- a/.github/workflows/docs-check.yml +++ b/.github/workflows/docs-check.yml @@ -35,7 +35,7 @@ jobs: uses: ./.github/workflows/build_linux_wheel - name: Free disk space working-directory: python - run: cargo clean + run: rm -r target/debug/ - name: Build Python working-directory: docs run: | diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml index 86ef8cb2821..3e729d0f16a 100644 --- a/.github/workflows/docs-deploy.yml +++ b/.github/workflows/docs-deploy.yml @@ -47,7 +47,7 @@ jobs: uses: ./.github/workflows/build_linux_wheel - name: Free disk space working-directory: python - run: cargo clean + run: rm -r target/debug/ - name: Build Python working-directory: python run: | From cec95431c8ef4322b7a3bcf7821b05b06e4fbd94 Mon Sep 17 00:00:00 2001 From: Will Jones Date: Mon, 21 Apr 2025 10:17:41 -0700 Subject: [PATCH 05/10] try this --- .github/workflows/docs-check.yml | 2 +- .github/workflows/docs-deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs-check.yml b/.github/workflows/docs-check.yml index 42338d43240..beed7731223 100644 --- a/.github/workflows/docs-check.yml +++ b/.github/workflows/docs-check.yml @@ -35,7 +35,7 @@ jobs: uses: ./.github/workflows/build_linux_wheel - name: Free disk space working-directory: python - run: rm -r target/debug/ + run: sudo cargo clean - name: Build Python working-directory: docs run: | diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml index 3e729d0f16a..aae3db76b45 100644 --- a/.github/workflows/docs-deploy.yml +++ b/.github/workflows/docs-deploy.yml @@ -47,7 +47,7 @@ jobs: uses: ./.github/workflows/build_linux_wheel - name: Free disk space working-directory: python - run: rm -r target/debug/ + run: sudo cargo clean - name: Build Python working-directory: python run: | From 77131ae610f284df08b027be1b93a6c5d95a3db3 Mon Sep 17 00:00:00 2001 From: Will Jones Date: Mon, 21 Apr 2025 10:30:00 -0700 Subject: [PATCH 06/10] another --- .github/workflows/docs-check.yml | 4 +++- .github/workflows/docs-deploy.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs-check.yml b/.github/workflows/docs-check.yml index beed7731223..6bb1bc48807 100644 --- a/.github/workflows/docs-check.yml +++ b/.github/workflows/docs-check.yml @@ -35,7 +35,9 @@ jobs: uses: ./.github/workflows/build_linux_wheel - name: Free disk space working-directory: python - run: sudo cargo clean + run: | + sudo chown 1001:118 -R python/target + cargo clean - name: Build Python working-directory: docs run: | diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml index aae3db76b45..af5db51ea1e 100644 --- a/.github/workflows/docs-deploy.yml +++ b/.github/workflows/docs-deploy.yml @@ -47,7 +47,9 @@ jobs: uses: ./.github/workflows/build_linux_wheel - name: Free disk space working-directory: python - run: sudo cargo clean + run: | + sudo chown 1001:118 -R python/target + cargo clean - name: Build Python working-directory: python run: | From 0016f4b3390f49b0f8f84c936376ad4692ebecd9 Mon Sep 17 00:00:00 2001 From: Will Jones Date: Mon, 21 Apr 2025 11:34:59 -0700 Subject: [PATCH 07/10] one more --- .github/workflows/docs-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs-check.yml b/.github/workflows/docs-check.yml index 6bb1bc48807..37266b38fa6 100644 --- a/.github/workflows/docs-check.yml +++ b/.github/workflows/docs-check.yml @@ -36,7 +36,7 @@ jobs: - name: Free disk space working-directory: python run: | - sudo chown 1001:118 -R python/target + sudo chown 1001:118 -R target cargo clean - name: Build Python working-directory: docs From e104ad09cec6fe64ac9b4733f99ae677e76c15ba Mon Sep 17 00:00:00 2001 From: Will Jones Date: Mon, 21 Apr 2025 11:44:25 -0700 Subject: [PATCH 08/10] get wheel out first --- .github/workflows/docs-check.yml | 3 ++- .github/workflows/docs-deploy.yml | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs-check.yml b/.github/workflows/docs-check.yml index 37266b38fa6..5432cba4e92 100644 --- a/.github/workflows/docs-check.yml +++ b/.github/workflows/docs-check.yml @@ -37,11 +37,12 @@ jobs: working-directory: python run: | sudo chown 1001:118 -R target + mv target/wheels/*.whl ./ cargo clean - name: Build Python working-directory: docs run: | - python -m pip install $(ls ../python/target/wheels/*.whl) + python -m pip install $(ls *.whl) python -m pip install -r requirements.txt - name: Run test working-directory: docs diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml index af5db51ea1e..13e2df93a40 100644 --- a/.github/workflows/docs-deploy.yml +++ b/.github/workflows/docs-deploy.yml @@ -48,12 +48,13 @@ jobs: - name: Free disk space working-directory: python run: | - sudo chown 1001:118 -R python/target + sudo chown 1001:118 -R target + mv target/wheels/*.whl ./ cargo clean - name: Build Python working-directory: python run: | - python -m pip install $(ls target/wheels/*.whl) + python -m pip install $(ls *.whl) python -m pip install -r ../docs/requirements.txt - name: Build docs working-directory: docs From 7e20b06a31c6f61c66042aa7a9023f325b8041a6 Mon Sep 17 00:00:00 2001 From: Will Jones Date: Mon, 21 Apr 2025 11:53:51 -0700 Subject: [PATCH 09/10] try this --- .github/workflows/docs-check.yml | 2 +- .github/workflows/docs-deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs-check.yml b/.github/workflows/docs-check.yml index 5432cba4e92..6aa91c3f68c 100644 --- a/.github/workflows/docs-check.yml +++ b/.github/workflows/docs-check.yml @@ -42,7 +42,7 @@ jobs: - name: Build Python working-directory: docs run: | - python -m pip install $(ls *.whl) + python -m pip install *.whl python -m pip install -r requirements.txt - name: Run test working-directory: docs diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml index 13e2df93a40..06340b0b591 100644 --- a/.github/workflows/docs-deploy.yml +++ b/.github/workflows/docs-deploy.yml @@ -54,7 +54,7 @@ jobs: - name: Build Python working-directory: python run: | - python -m pip install $(ls *.whl) + python -m pip install *.whl python -m pip install -r ../docs/requirements.txt - name: Build docs working-directory: docs From 10b7dcd1e320430365c2db43ef88864e8f82b1b6 Mon Sep 17 00:00:00 2001 From: Will Jones Date: Mon, 21 Apr 2025 12:14:16 -0700 Subject: [PATCH 10/10] correct directory --- .github/workflows/docs-check.yml | 2 +- .github/workflows/docs-deploy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs-check.yml b/.github/workflows/docs-check.yml index 6aa91c3f68c..8cd8fa8af00 100644 --- a/.github/workflows/docs-check.yml +++ b/.github/workflows/docs-check.yml @@ -42,7 +42,7 @@ jobs: - name: Build Python working-directory: docs run: | - python -m pip install *.whl + python -m pip install ../python/*.whl python -m pip install -r requirements.txt - name: Run test working-directory: docs diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml index 06340b0b591..4e22458bc21 100644 --- a/.github/workflows/docs-deploy.yml +++ b/.github/workflows/docs-deploy.yml @@ -54,7 +54,7 @@ jobs: - name: Build Python working-directory: python run: | - python -m pip install *.whl + python -m pip install ../python/*.whl python -m pip install -r ../docs/requirements.txt - name: Build docs working-directory: docs