refactor data-update.yml

Also fixes a cache issue found on data-update.yml, this fix is applied on checker.yml and container.yml files
This commit is contained in:
Ivan Gabaldon 2025-05-04 20:32:27 +02:00
parent bbbd61eff7
commit a7efdd908b
No known key found for this signature in database
GPG Key ID: 075587C93FA67582
3 changed files with 41 additions and 33 deletions

View File

@ -31,8 +31,8 @@ jobs:
- name: Setup cache Python - name: Setup cache Python
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
key: "python-${{ env.PYTHON_VERSION }}-${{ hashFiles('./requirements*.txt') }}" key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}"
restore-keys: "python-${{ env.PYTHON_VERSION }}-" restore-keys: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-"
path: "./local" path: "./local"
- name: Setup venv - name: Setup venv

View File

@ -53,8 +53,8 @@ jobs:
- name: Setup cache Python - name: Setup cache Python
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
key: "python-${{ env.PYTHON_VERSION }}-${{ hashFiles('./requirements*.txt') }}" key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}"
restore-keys: "python-${{ env.PYTHON_VERSION }}-" restore-keys: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-"
path: "./local" path: "./local"
- name: Setup cache container mounts - name: Setup cache container mounts

View File

@ -1,3 +1,4 @@
---
name: Update searx.data name: Update searx.data
# yamllint disable-line rule:truthy # yamllint disable-line rule:truthy
@ -6,11 +7,17 @@ on:
schedule: schedule:
- cron: "59 23 28 * *" - cron: "59 23 28 * *"
permissions:
contents: read
env:
PYTHON_VERSION: "3.13"
jobs: jobs:
updateData: updateData:
name: Update data - ${{ matrix.fetch }} if: github.repository_owner == 'searxng'
runs-on: ubuntu-24.04 name: ${{ matrix.fetch }}
if: ${{ github.repository_owner == 'searxng'}} runs-on: ubuntu-24.04-arm
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@ -22,42 +29,43 @@ jobs:
- update_engine_traits.py - update_engine_traits.py
- update_wikidata_units.py - update_wikidata_units.py
- update_engine_descriptions.py - update_engine_descriptions.py
steps: steps:
- name: Checkout - name: Setup Python
uses: actions/checkout@v4
- name: Install Ubuntu packages
run: |
sudo ./utils/searxng.sh install packages
- name: Set up Python
uses: actions/setup-python@v5 uses: actions/setup-python@v5
with: with:
python-version: '3.12' python-version: "${{ env.PYTHON_VERSION }}"
architecture: 'x64'
- name: Install Python dependencies - name: Checkout
run: | uses: actions/checkout@v4
make V=1 install with:
persist-credentials: "false"
- name: Setup cache Python
uses: actions/cache@v4
with:
key: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-${{ hashFiles('./requirements*.txt') }}"
restore-keys: "python-${{ env.PYTHON_VERSION }}-${{ runner.arch }}-"
path: "./local"
- name: Setup venv
run: make V=1 install
- name: Fetch data - name: Fetch data
env: run: V=1 ./manage pyenv.cmd python "./searxng_extra/update/${{ matrix.fetch }}"
FETCH_SCRIPT: ./searxng_extra/update/${{ matrix.fetch }}
run: |
V=1 ./manage pyenv.cmd python "$FETCH_SCRIPT"
- name: Create Pull Request - name: Create Pull Request
id: cpr id: cpr
uses: peter-evans/create-pull-request@v6 uses: peter-evans/create-pull-request@v7
with: with:
commit-message: '[data] update searx.data - ${{ matrix.fetch }}' author: "${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>"
committer: searxng-bot <noreply@github.com> committer: "searxng-bot <noreply@github.com>"
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com> title: "[data] update searx.data - ${{ matrix.fetch }}"
signoff: false commit-message: "[data] update searx.data - ${{ matrix.fetch }}"
branch: update_data_${{ matrix.fetch }} branch: "update_data_${{ matrix.fetch }}"
delete-branch: true delete-branch: "true"
draft: false draft: "false"
title: '[data] update searx.data - ${{ matrix.fetch }}' signoff: "false"
body: | body: |
update searx.data - ${{ matrix.fetch }} update searx.data - ${{ matrix.fetch }}
labels: | labels: |