diff --git a/.github/workflows/gh-pages-builddocs.yml b/.github/workflows/gh-pages-builddocs.yml index 9b18d0a..4518b16 100644 --- a/.github/workflows/gh-pages-builddocs.yml +++ b/.github/workflows/gh-pages-builddocs.yml @@ -237,18 +237,19 @@ jobs: - name: Checkout and prep Salt run: | git clone --depth 1 -b "${DOC_BRANCH}" https://github.com/saltstack/salt - sed -i "s:^timelib==.*::g" salt/requirements/static/pkg/py3.10/linux.txt - sed -i "s:^cffi==.*::g" salt/requirements/static/pkg/py3.10/linux.txt - sed -i "s:^contextvars==.*::g" salt/requirements/static/pkg/py3.10/linux.txt - sed -i "s:^immutables==.*::g" salt/requirements/static/pkg/py3.10/linux.txt - sed -i "s:^rpm-vercmp==.*::g" salt/requirements/static/pkg/py3.10/linux.txt + find salt/requirements -name "linux*" | sort + sed -i "s:^timelib==.*::g" salt/requirements/static/pkg/py3.10/linux.lock + sed -i "s:^cffi==.*::g" salt/requirements/static/pkg/py3.10/linux.lock + sed -i "s:^contextvars==.*::g" salt/requirements/static/pkg/py3.10/linux.lock + sed -i "s:^immutables==.*::g" salt/requirements/static/pkg/py3.10/linux.lock + sed -i "s:^rpm-vercmp==.*::g" salt/requirements/static/pkg/py3.10/linux.lock - name: Install Python prereqs run: | apt update && apt install libffi-dev -y python3 -m venv venv source venv/bin/activate pip install -U pip setuptools wheel - pip install -r salt/requirements/static/ci/py3.10/docs.txt && pip install -r salt/requirements/static/pkg/py3.10/linux.txt + pip install -r salt/requirements/static/ci/py3.10/docs.lock && pip install -r salt/requirements/static/pkg/py3.10/linux.lock pip install jaraco.text==3.14.0 - name: Build docs run: | @@ -279,18 +280,19 @@ jobs: - name: Checkout and prep Salt run: | git clone --depth 1 -b "${DOC_BRANCH}" https://github.com/saltstack/salt - sed -i "s:^timelib==.*::g" salt/requirements/static/pkg/py3.10/linux.txt - sed -i "s:^cffi==.*::g" salt/requirements/static/pkg/py3.10/linux.txt - sed -i "s:^contextvars==.*::g" salt/requirements/static/pkg/py3.10/linux.txt - sed -i "s:^immutables==.*::g" salt/requirements/static/pkg/py3.10/linux.txt - sed -i "s:^rpm-vercmp==.*::g" salt/requirements/static/pkg/py3.10/linux.txt + find salt/requirements -name "linux*" | sort + sed -i "s:^timelib==.*::g" salt/requirements/static/pkg/py3.10/linux.lock + sed -i "s:^cffi==.*::g" salt/requirements/static/pkg/py3.10/linux.lock + sed -i "s:^contextvars==.*::g" salt/requirements/static/pkg/py3.10/linux.lock + sed -i "s:^immutables==.*::g" salt/requirements/static/pkg/py3.10/linux.lock + sed -i "s:^rpm-vercmp==.*::g" salt/requirements/static/pkg/py3.10/linux.lock - name: Install Python prereqs run: | apt update && apt install libffi-dev -y python3 -m venv venv source venv/bin/activate pip install -U pip setuptools wheel - pip install -r salt/requirements/static/ci/py3.10/docs.txt && pip install -r salt/requirements/static/pkg/py3.10/linux.txt + pip install -r salt/requirements/static/ci/py3.10/docs.lock && pip install -r salt/requirements/static/pkg/py3.10/linux.lock pip install jaraco.text==3.14.0 - name: Build docs run: |