diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 2d7f33351..1ce9f0090 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -53,20 +53,23 @@ jobs: run: | pixi run --locked -e full-py311 docs export CURRENT_VERSION=$(grep "__version__" hydromt/__init__.py | cut -d= -f 2 | tr -d "\" ") + if [ -z "$CURRENT_VERSION" ]; then echo "Could not determine version, exiting..." exit 1 fi - # are we a dev version or not? + # Are we a dev version or not? if echo "$CURRENT_VERSION" | grep -q "dev"; then - # no dev, just echo the version number - echo "v$CURRENT_VERSION" >> "$GITHUB_ENV" + # If it's a dev version, just echo "dev" + echo "DOC_VERSION=dev" >> "$GITHUB_ENV" else - echo "dev" >> "$GITHUB_ENV" + # Otherwise, echo the version number + echo "DOC_VERSION=v$CURRENT_VERSION" >> "$GITHUB_ENV" fi + - name: Upload to GitHub Pages if: ${{ github.event_name != 'pull_request' }} uses: peaceiris/actions-gh-pages@v3.9.3 diff --git a/Dockerfile b/Dockerfile index 804dcd8b3..81afb3843 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN useradd deltares USER deltares WORKDIR /home/deltares -RUN curl -proto="https" -fsSL https://pixi.sh/install.sh | bash +RUN curl --proto="https" -fsSL https://pixi.sh/install.sh | bash ENV PATH=/home/deltares/.pixi/bin:$PATH COPY pixi.toml pixi.lock pyproject.toml README.rst ./ COPY data/ ./data