From 5818a2d2db9cc04e40d917475162c2f86af32887 Mon Sep 17 00:00:00 2001 From: Lea Vauchier Date: Mon, 11 May 2026 16:13:34 +0200 Subject: [PATCH] Update gh-actions due to node.js upgrade in github ci --- .github/workflows/cicd.yaml | 4 ++-- .github/workflows/gh-pages.yml | 44 +++++++++++----------------------- 2 files changed, 16 insertions(+), 32 deletions(-) diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index 41465b58..c2a210c1 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout branch - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Build docker image run: docker build --build-arg http_proxy=${{ secrets.PROXY_URL }} --build-arg https_proxy=${{ secrets.PROXY_URL }} -t myria3d . @@ -139,7 +139,7 @@ jobs: # See https://github.com/marketplace/actions/setup-micromamba - name: setup-micromamba - uses: mamba-org/setup-micromamba@v1.4.3 + uses: mamba-org/setup-micromamba@v3.0.0 with: environment-file: environment.yml environment-name: myria3d # activate the environment diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index e95d3bd2..20587a89 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -7,12 +7,11 @@ on: - main # UNCOMMENT TO DEBUG DOCUMENTATION - # pull_request: - # branches: - # - main + pull_request: + branches: + - main jobs: - build-and-deploy: runs-on: ubuntu-latest @@ -23,35 +22,20 @@ jobs: # Task to do when launching the workflow steps: - # 1. First get the repository source - name: "Checkout" - uses: actions/checkout@v3 + uses: actions/checkout@v6 - # 2. Setup virtual environment with mamba - # See https://github.com/conda-incubator/setup-miniconda#caching-environments - - - name: Setup a conda-incubator with an empty conda env - uses: conda-incubator/setup-miniconda@v2 - with: - python-version: 3.9.12 - miniforge-variant: Mambaforge - miniforge-version: latest - use-mamba: true - # Environment to create and activate for next steps - activate-environment: myria3d - - - name: Cache conda environment based on dependencies. - uses: actions/cache@v3 + # See https://github.com/marketplace/actions/setup-micromamba + - name: setup-micromamba + uses: mamba-org/setup-micromamba@v3.0.0 with: - path: ${{ env.CONDA }}/envs - key: conda-${{ hashFiles('environment.yml') }} - id: cache - - - name: Update the (currently empty) myria3d environment, if a cache cannot be found. - if: steps.cache.outputs.cache-hit != 'true' - run: mamba env update -n myria3d -f environment.yml + environment-file: environment.yml + environment-name: myria3d # activate the environment + cache-environment: true + cache-downloads: true + generate-run-shell: true - name: "Build documentation" working-directory: ./docs/ @@ -64,6 +48,6 @@ jobs: - name: "Deploy documentation on Github pages" uses: JamesIves/github-pages-deploy-action@v4 with: - BRANCH: gh-pages # <- Branch where generated doc files will be commited + BRANCH: gh-pages # <- Branch where generated doc files will be commited # BRANCH: gh-pages-DEBUG # <-- UNCOMMENT TO DEBUG DOCUMENTATION - FOLDER: docs/build/html/ # <- Dir where .nojekyll is created and from which to deploy github pages. + FOLDER: docs/build/html/ # <- Dir where .nojekyll is created and from which to deploy github pages.