diff --git a/.github/workflows/data-update.yml b/.github/workflows/data-update.yml index cb0671621..073305983 100644 --- a/.github/workflows/data-update.yml +++ b/.github/workflows/data-update.yml @@ -42,7 +42,7 @@ jobs: env: FETCH_SCRIPT: ./searxng_extra/update/${{ matrix.fetch }} run: | - V=1 rye run python "$FETCH_SCRIPT" + V=1 ./manage rye run python "$FETCH_SCRIPT" - name: Create Pull Request id: cpr diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 4512d25cc..95d4741c0 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -30,6 +30,7 @@ jobs: with: path: | ./.venv + ./.local ./.nvm ./node_modules key: python-rye-${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('requirements*.txt', 'setup.py') }} @@ -59,20 +60,16 @@ jobs: uses: actions/checkout@v4 - name: Install Ubuntu packages run: sudo ./utils/searxng.sh install buildhost - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.9' - architecture: 'x64' - name: Cache Python dependencies id: cache-python uses: actions/cache@v3 with: path: | ./.venv + ./.local ./.nvm ./node_modules - key: python-rye-ubuntu-20.04-3.9-${{ hashFiles('requirements*.lock', 'pyproject.toml','.nvmrc', 'package.json') }} + key: python-rye-ubuntu-20.04-3.11-${{ hashFiles('requirements*.lock', 'pyproject.toml','.nvmrc', 'package.json') }} - name: Install node dependencies run: make V=1 node.env - name: Build themes @@ -91,11 +88,6 @@ jobs: persist-credentials: false - name: Install Ubuntu packages run: sudo ./utils/searxng.sh install buildhost - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.9' - architecture: 'x64' - name: Cache Python dependencies id: cache-python uses: actions/cache@v3 @@ -104,7 +96,7 @@ jobs: ./local ./.nvm ./node_modules - key: python-rye-ubuntu-20.04-3.9-${{ hashFiles('requirements*.lock', 'pyproject.toml','.nvmrc', 'package.json') }} + key: python-rye-ubuntu-20.04-3.11-${{ hashFiles('requirements*.lock', 'pyproject.toml','.nvmrc', 'package.json') }} - name: Build documentation run: | make V=1 docs.clean docs.html @@ -135,11 +127,6 @@ jobs: with: fetch-depth: '0' token: ${{ secrets.WEBLATE_GITHUB_TOKEN }} - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.9' - architecture: 'x64' - name: Cache Python dependencies id: cache-python uses: actions/cache@v3 @@ -148,7 +135,7 @@ jobs: ./local ./.nvm ./node_modules - key: python-rye-ubuntu-20.04-3.9-${{ hashFiles('requirements*.lock', 'pyproject.toml','.nvmrc', 'package.json') }} + key: python-rye-ubuntu-20.04-3.11-${{ hashFiles('requirements*.lock', 'pyproject.toml','.nvmrc', 'package.json') }} - name: weblate & git setup env: WEBLATE_CONFIG: ${{ secrets.WEBLATE_CONFIG }} @@ -179,11 +166,6 @@ jobs: with: # make sure "make docker.push" can get the git history fetch-depth: '0' - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.9' - architecture: 'x64' - name: Cache Python dependencies id: cache-python uses: actions/cache@v3 @@ -192,7 +174,7 @@ jobs: ./local ./.nvm ./node_modules - key: python-rye-ubuntu-20.04-3.9-${{ hashFiles('requirements*.lock', 'pyproject.toml','.nvmrc', 'package.json') }} + key: python-rye-ubuntu-20.04-3.11-${{ hashFiles('requirements*.lock', 'pyproject.toml','.nvmrc', 'package.json') }} - name: Set up QEMU if: env.DOCKERHUB_USERNAME != null uses: docker/setup-qemu-action@v1 diff --git a/.github/workflows/translations-update.yml b/.github/workflows/translations-update.yml index 6c1c24562..1320d442c 100644 --- a/.github/workflows/translations-update.yml +++ b/.github/workflows/translations-update.yml @@ -15,20 +15,16 @@ jobs: with: fetch-depth: '0' token: ${{ secrets.WEBLATE_GITHUB_TOKEN }} - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.9' - architecture: 'x64' - name: Cache Python dependencies id: cache-python uses: actions/cache@v3 with: path: | - ./local + ./.venv + ./.local ./.nvm ./node_modules - key: python-ubuntu-20.04-3.9-${{ hashFiles('requirements*.txt', 'setup.py','.nvmrc', 'package.json') }} + key: python-rye-ubuntu-20.04-3.11-${{ hashFiles('requirements*.lock', 'pyproject.toml','.nvmrc', 'package.json') }} - name: weblate & git setup env: WEBLATE_CONFIG: ${{ secrets.WEBLATE_CONFIG }}