Verified Commit 4a1ba172 authored by Jérôme Charaoui's avatar Jérôme Charaoui 🕯️
Browse files

stop folding newlines, always keep them

this is sometimes causing issues with gitlab ci
parent c5434085
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -29,36 +29,36 @@ include:
      - python3 -m venv venv
      - source venv/bin/activate
      - pip install --require-hashes -r lego/lektor-requirements.txt
      - >
      - |
        if [ -f requirements.txt ]; then
          pip install -r requirements.txt
        fi
      - >
      - |
        if [ -d packages/envvars ]; then
          wget --quiet https://gitlab.torproject.org/tpo/tpa/ci-templates/-/raw/main/lektor-requirements-envvars.txt -O- >> requirements.txt
        fi
      - python3 -m pip --version || apt-get install -y python3-pip
      - export LEKTOR_BUILD_ARGS="--buildstate-path .cache/lektor --output-path public"
      - | # check if we need dart sass installed
      - |
        if [ "$(grep -E '.*\bscss\b.*' <<<"$LEKTOR_BUILD_FLAGS")" ]; then
          # install dart sass using a script from lego
          ./lego/scripts/download-sass.sh
          export PATH=/root/.local/bin:"$PATH"
        fi
      - >
      - |
        if [ -n "${LEKTOR_BUILD_FLAGS}" ]; then
          for flag in $LEKTOR_BUILD_FLAGS; do export LEKTOR_BUILD_ARGS="${LEKTOR_BUILD_ARGS} -f $flag"; done
        fi
      - >
      - |
        if [ -n "${TRANSLATION_BRANCH}" ]; then
          echo -e "\e[33mchecking out translation branch: ${TRANSLATION_BRANCH}\e[0m"
          rm -rf i18n
          git clone --branch "${TRANSLATION_BRANCH}" --depth=1 https://gitlab.torproject.org/tpo/translation.git i18n
        fi
      - >
      - |
        echo -e "\e[33mbuilding lektor with: ${LEKTOR_BUILD_ARGS}\e[0m"
        lektor build $LEKTOR_BUILD_ARGS || exit 1
      - >
      - |
        if [ -n "${TRANSLATION_BRANCH}" ] && dpkg --compare-versions $(pip show lektor-i18n | grep -oP 'Version: \K.*') lt 0.5.0; then
          echo -e '\e[31mold i18n plugin version detected, building lektor 2 more times to get translations in place\e[0m'
          echo -e '\e[31mplease rebase to fix this problem\e[0m'