From a3d4828dbb6d769d938cea77f1bed526c0ef4df9 Mon Sep 17 00:00:00 2001 From: Twangboy Date: Wed, 24 Jun 2026 16:33:12 -0600 Subject: [PATCH 1/2] Fix previous-3006 jobs: update requirements file extension from .txt to .lock --- .github/workflows/gh-pages-builddocs.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/gh-pages-builddocs.yml b/.github/workflows/gh-pages-builddocs.yml index 9b18d0a..6b35655 100644 --- a/.github/workflows/gh-pages-builddocs.yml +++ b/.github/workflows/gh-pages-builddocs.yml @@ -237,18 +237,18 @@ 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 + 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 +279,18 @@ 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 + 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: | From d84faffd6af1c96fcfb66d6337f1aae0031204b1 Mon Sep 17 00:00:00 2001 From: Twangboy Date: Wed, 24 Jun 2026 16:41:14 -0600 Subject: [PATCH 2/2] Fix dependencies --- .github/workflows/gh-pages-builddocs.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/gh-pages-builddocs.yml b/.github/workflows/gh-pages-builddocs.yml index 6b35655..4518b16 100644 --- a/.github/workflows/gh-pages-builddocs.yml +++ b/.github/workflows/gh-pages-builddocs.yml @@ -237,6 +237,7 @@ jobs: - name: Checkout and prep Salt run: | git clone --depth 1 -b "${DOC_BRANCH}" https://github.com/saltstack/salt + 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 @@ -279,6 +280,7 @@ jobs: - name: Checkout and prep Salt run: | git clone --depth 1 -b "${DOC_BRANCH}" https://github.com/saltstack/salt + 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